Merge branch 'main' of github.com:koush/scrypted

server: Fix bug where mixins are not invalidated after a plugin restart fails, and then later succeeds.
homekit: Update README.md
2026-02-05 23:22:13 +00:00 · 2024-06-25 22:10:51 -07:00 · 2024-06-25 22:10:45 -07:00 · 2024-06-25 19:18:51 -07:00 · 2024-06-25 19:16:58 -07:00 · 2024-06-25 15:46:25 -07:00
233 changed files with 7459 additions and 4339 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -13,11 +13,11 @@ Before opening an issue, view the device's Console logs in the Scrypted Manageme

 **DO NOT OPEN ISSUES FOR ANY OF THE FOLLOWING:**

-* Server setup assistance. Use Discord, Reddit, or Github Discussions.
-* Hardware setup assistance. Use Discord, Reddit, or Github Discussions.
+* Server or hardware setup assistance. Use Discord, Reddit, or Github Discussions.
 * Feature Requests. Use Discord, Reddit, or Github Discussions.
 * Packet loss in your camera logs. This is wifi/network congestion.
 * HomeKit weirdness. See HomeKit troubleshooting guide.
+* Release schedules or timelines. Releases are rolled out unevenly across the different server platforms.

 However, if something **was working**, and is now **no longer working**, you may create a Github issue.
 Created issues that do not meet these requirements or are improperly filled out will be immediately closed.
--- a/.github/workflows/docker-common.yml
+++ b/.github/workflows/docker-common.yml
@@ -7,13 +7,10 @@ jobs:
  build:
    name: Push Docker image to Docker Hub
    runs-on: self-hosted
-#     runs-on: ubuntu-latest
+    env:
+      NODE_VERSION: '20'
    strategy:
      matrix:
-        NODE_VERSION: [
-          # "18",
-          "20"
-        ]
        BASE: ["jammy"]
        FLAVOR: ["full", "lite"]
    steps:
@@ -23,12 +20,26 @@ jobs:
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2

+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: ${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+
      - name: Set up SSH
        uses: MrSquaare/ssh-setup-action@v2
        with:
          host: ${{ secrets.DOCKER_SSH_HOST_ARM64 }}
          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}

+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64
+          append: |
+            - endpoint: ssh://${{ secrets.DOCKER_SSH_USER }}@${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+              platforms: linux/amd64
+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
        with:
@@ -54,14 +65,84 @@ jobs:
        uses: docker/build-push-action@v4
        with:
          build-args: |
-            NODE_VERSION=${{ matrix.NODE_VERSION }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
            BASE=${{ matrix.BASE }}
          context: install/docker/
          file: install/docker/Dockerfile.${{ matrix.FLAVOR }}
          platforms: linux/amd64,linux/arm64
          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 }}
+            koush/scrypted-common:${{ matrix.BASE }}-${{ matrix.FLAVOR }}
+            ghcr.io/koush/scrypted-common:${{ matrix.BASE }}-${{ matrix.FLAVOR }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-nvidia:
+    name: Push NVIDIA Docker image to Docker Hub
+    needs: build
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        BASE: ["jammy"]
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: ${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+
+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: ${{ secrets.DOCKER_SSH_HOST_ARM64 }}
+          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64
+          append: |
+            - endpoint: ssh://${{ secrets.DOCKER_SSH_USER }}@${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+              platforms: linux/amd64
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/arm64
+          append: |
+            - endpoint: ssh://${{ secrets.DOCKER_SSH_USER }}@${{ secrets.DOCKER_SSH_HOST_ARM64 }}
+              platforms: linux/arm64
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Login to Github Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image (scrypted-common)
+        uses: docker/build-push-action@v4
+        with:
+          build-args: |
+            BASE=ghcr.io/koush/scrypted-common:${{ matrix.BASE }}-full
+          context: install/docker/
+          file: install/docker/Dockerfile.nvidia
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            koush/scrypted-common:${{ matrix.BASE }}-nvidia
+            ghcr.io/koush/scrypted-common:${{ matrix.BASE }}-nvidia
          cache-from: type=gha
          cache-to: type=gha,mode=max
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,10 +20,10 @@ jobs:
    strategy:
      matrix:
        BASE: [
-          "20-jammy-full",
-          "20-jammy-lite",
+          ["jammy-nvidia", ".s6"],
+          ["jammy-full", ".s6"],
+          ["jammy-lite", ""],
        ]
-        SUPERVISOR: ["", ".s6"]
    steps:
      - name: Check out the repo
        uses: actions/checkout@v3
@@ -42,12 +42,26 @@ jobs:
      - name: Set up QEMU
        uses: docker/setup-qemu-action@v2

+      - name: Set up SSH
+        uses: MrSquaare/ssh-setup-action@v2
+        with:
+          host: ${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}
+
      - name: Set up SSH
        uses: MrSquaare/ssh-setup-action@v2
        with:
          host: ${{ secrets.DOCKER_SSH_HOST_ARM64 }}
          private-key: ${{ secrets.DOCKER_SSH_PRIVATE_KEY }}

+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          platforms: linux/amd64
+          append: |
+            - endpoint: ssh://${{ secrets.DOCKER_SSH_USER }}@${{ secrets.DOCKER_SSH_HOST_AMD64 }}
+              platforms: linux/amd64
+
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2
        with:
@@ -73,23 +87,23 @@ jobs:
        uses: docker/build-push-action@v4
        with:
          build-args: |
-            BASE=${{ matrix.BASE }}
+            BASE=${{ matrix.BASE[0] }}
            SCRYPTED_INSTALL_VERSION=${{ steps.package-version.outputs.NPM_VERSION }}
          context: install/docker/
-          file: install/docker/Dockerfile${{ matrix.SUPERVISOR }}
+          file: install/docker/Dockerfile${{ matrix.BASE[1] }}
          platforms: linux/amd64,linux/arm64
          push: true
          tags: |
-            ${{ format('koush/scrypted:{0}{1}-v{2}', matrix.BASE, matrix.SUPERVISOR, github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }}
-            ${{ matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '.s6' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '' && 'koush/scrypted:full' || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '' && 'koush/scrypted:lite' || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '.s6' && 'koush/scrypted:lite-s6' || '' }}
+            ${{ format('koush/scrypted:v{1}-{0}', matrix.BASE[0], github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }}
+            ${{ matrix.BASE[0] == 'jammy-full' && format('koush/scrypted:{0}', github.event.inputs.tag) || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-nvidia' && 'koush/scrypted:nvidia' || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-full' && 'koush/scrypted:full' || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-lite' && 'koush/scrypted:lite' || '' }}

-            ${{ format('ghcr.io/koush/scrypted:{0}{1}-v{2}', matrix.BASE, matrix.SUPERVISOR, github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }}
-            ${{ matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '.s6' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-full' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:full' || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '' && 'ghcr.io/koush/scrypted:lite' || '' }}
-            ${{ github.event.inputs.tag == 'latest' && matrix.BASE == '20-jammy-lite' && matrix.SUPERVISOR == '.s6' && 'ghcr.io/koush/scrypted:lite-s6' || '' }}
+            ${{ format('ghcr.io/koush/scrypted:v{1}-{0}', matrix.BASE[0], github.event.inputs.publish_tag || steps.package-version.outputs.NPM_VERSION) }}
+            ${{ matrix.BASE[0] == 'jammy-full' && format('ghcr.io/koush/scrypted:{0}', github.event.inputs.tag) || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-nvidia' && 'ghcr.io/koush/scrypted:nvidia' || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-full' && 'ghcr.io/koush/scrypted:full' || '' }}
+            ${{ github.event.inputs.tag == 'latest' && matrix.BASE[0] == 'jammy-lite' && 'ghcr.io/koush/scrypted:lite' || '' }}
          cache-from: type=gha
          cache-to: type=gha,mode=max
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,52 +9,28 @@ on:
  workflow_dispatch:
  
 jobs:
-  test_linux_local:
-    name: Test Linux local installation
-    runs-on: ubuntu-latest
+  test_local:
+    name: Test local installation on ${{ matrix.runner }}
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        runner: [ubuntu-latest, macos-14, macos-13, windows-latest]
    
    steps:
      - name: Checkout repository
        uses: actions/checkout@v3
-        
-      - name: Run install script
+
+      - name: Parse latest server release
+        id: parse_server
+        shell: bash
        run: |
-          cat ./install/local/install-scrypted-dependencies-linux.sh | sudo SERVICE_USER=$USER bash
-          
-      - name: Test server is running
-        run: |
-          systemctl status scrypted.service
-          curl -k --retry 20 --retry-all-errors --retry-max-time 600 https://localhost:10443/
-          
-  test_mac_local:
-    name: Test Mac local installation
-    runs-on: macos-latest
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        
-      - name: Run install script
-        run: |
-          mkdir -p ~/.scrypted
-          bash ./install/local/install-scrypted-dependencies-mac.sh
-          
-      - name: Test server is running
-        run: |
-          curl -k --retry 20 --retry-all-errors --retry-max-time 600 https://localhost:10443/
-          
-  test_windows_local:
-    name: Test Windows local installation
-    runs-on: windows-latest
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-        
-      - name: Run install script
-        run: |
-          .\install\local\install-scrypted-dependencies-win.ps1
-          
-      - name: Test server is running
-        run: |
-          curl -k --retry 20 --retry-all-errors --retry-max-time 600 https://localhost:10443/
+          VERSION=$(cat ./server/package-lock.json | jq -r '.version')
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "Will test @scrypted/server@$VERSION"
+
+      - name: Install scrypted server
+        uses: scryptedapp/setup-scrypted@v0.0.2
+        with:
+          branch: ${{ github.sha }}
+          version: ${{ steps.parse_server.outputs.version }}
--- a/common/package-lock.json
+++ b/common/package-lock.json
@@ -74,7 +74,7 @@
    },
    "../sdk": {
      "name": "@scrypted/sdk",
-      "version": "0.3.4",
+      "version": "0.3.29",
      "license": "ISC",
      "dependencies": {
        "@babel/preset-typescript": "^7.18.6",
@@ -111,64 +111,57 @@
    },
    "../server": {
      "name": "@scrypted/server",
-      "version": "0.82.0",
+      "version": "0.106.0",
+      "hasInstallScript": true,
      "license": "ISC",
      "dependencies": {
        "@mapbox/node-pre-gyp": "^1.0.11",
-        "@scrypted/types": "^0.3.4",
-        "adm-zip": "^0.5.10",
+        "@scrypted/ffmpeg-static": "^6.1.0-build1",
+        "@scrypted/node-pty": "^1.0.10",
+        "@scrypted/types": "^0.3.28",
+        "adm-zip": "^0.5.12",
        "body-parser": "^1.20.2",
        "cookie-parser": "^1.4.6",
-        "debug": "^4.3.4",
+        "dotenv": "^16.4.5",
        "engine.io": "^6.5.4",
-        "express": "^4.18.2",
-        "ffmpeg-static": "^5.2.0",
-        "follow-redirects": "^1.15.4",
+        "express": "^4.19.2",
+        "follow-redirects": "^1.15.6",
        "http-auth": "^4.2.0",
-        "ip": "^1.1.8",
-        "level": "^8.0.0",
-        "linkfs": "^2.1.0",
+        "ip": "^2.0.1",
+        "level": "^8.0.1",
        "lodash": "^4.17.21",
-        "memfs": "^4.6.0",
-        "mime": "^3.0.0",
-        "nan": "^2.18.0",
+        "nan": "^2.19.0",
        "node-dijkstra": "^2.5.0",
        "node-forge": "^1.3.1",
-        "node-gyp": "^10.0.1",
+        "node-gyp": "^10.1.0",
+        "py": "npm:@bjia56/portable-python@^0.1.31",
        "router": "^1.3.8",
-        "semver": "^7.5.4",
-        "sharp": "^0.33.1",
+        "semver": "^7.6.2",
+        "sharp": "^0.33.3",
        "source-map-support": "^0.5.21",
-        "tar": "^6.2.0",
+        "tar": "^7.1.0",
        "tslib": "^2.6.2",
-        "typescript": "^5.3.3",
+        "typescript": "^5.4.5",
        "whatwg-mimetype": "^4.0.0",
-        "ws": "^8.16.0"
+        "ws": "^8.17.0"
      },
      "bin": {
        "scrypted-serve": "bin/scrypted-serve"
      },
      "devDependencies": {
        "@types/adm-zip": "^0.5.5",
-        "@types/cookie-parser": "^1.4.6",
-        "@types/debug": "^4.1.12",
+        "@types/cookie-parser": "^1.4.7",
        "@types/express": "^4.17.21",
        "@types/follow-redirects": "^1.14.4",
        "@types/http-auth": "^4.1.4",
        "@types/ip": "^1.1.3",
-        "@types/lodash": "^4.14.202",
-        "@types/mime": "^3.0.4",
+        "@types/lodash": "^4.17.1",
        "@types/node-dijkstra": "^2.5.6",
-        "@types/node-forge": "^1.3.10",
-        "@types/pem": "^1.14.4",
-        "@types/semver": "^7.5.6",
+        "@types/node-forge": "^1.3.11",
+        "@types/semver": "^7.5.8",
        "@types/source-map-support": "^0.5.10",
-        "@types/tar": "^6.1.10",
        "@types/whatwg-mimetype": "^3.0.2",
        "@types/ws": "^8.5.10"
-      },
-      "optionalDependencies": {
-        "node-pty-prebuilt-multiarch": "^0.10.1-pre.5"
      }
    },
    "node_modules/@cspotcode/source-map-support": {
@@ -453,53 +446,47 @@
      "version": "file:../server",
      "requires": {
        "@mapbox/node-pre-gyp": "^1.0.11",
-        "@scrypted/types": "^0.3.4",
+        "@scrypted/ffmpeg-static": "^6.1.0-build1",
+        "@scrypted/node-pty": "^1.0.10",
+        "@scrypted/types": "^0.3.28",
        "@types/adm-zip": "^0.5.5",
-        "@types/cookie-parser": "^1.4.6",
-        "@types/debug": "^4.1.12",
+        "@types/cookie-parser": "^1.4.7",
        "@types/express": "^4.17.21",
        "@types/follow-redirects": "^1.14.4",
        "@types/http-auth": "^4.1.4",
        "@types/ip": "^1.1.3",
-        "@types/lodash": "^4.14.202",
-        "@types/mime": "^3.0.4",
+        "@types/lodash": "^4.17.1",
        "@types/node-dijkstra": "^2.5.6",
-        "@types/node-forge": "^1.3.10",
-        "@types/pem": "^1.14.4",
-        "@types/semver": "^7.5.6",
+        "@types/node-forge": "^1.3.11",
+        "@types/semver": "^7.5.8",
        "@types/source-map-support": "^0.5.10",
-        "@types/tar": "^6.1.10",
        "@types/whatwg-mimetype": "^3.0.2",
        "@types/ws": "^8.5.10",
-        "adm-zip": "^0.5.10",
+        "adm-zip": "^0.5.12",
        "body-parser": "^1.20.2",
        "cookie-parser": "^1.4.6",
-        "debug": "^4.3.4",
+        "dotenv": "^16.4.5",
        "engine.io": "^6.5.4",
-        "express": "^4.18.2",
-        "ffmpeg-static": "^5.2.0",
-        "follow-redirects": "^1.15.4",
+        "express": "^4.19.2",
+        "follow-redirects": "^1.15.6",
        "http-auth": "^4.2.0",
-        "ip": "^1.1.8",
-        "level": "^8.0.0",
-        "linkfs": "^2.1.0",
+        "ip": "^2.0.1",
+        "level": "^8.0.1",
        "lodash": "^4.17.21",
-        "memfs": "^4.6.0",
-        "mime": "^3.0.0",
-        "nan": "^2.18.0",
+        "nan": "^2.19.0",
        "node-dijkstra": "^2.5.0",
        "node-forge": "^1.3.1",
-        "node-gyp": "^10.0.1",
-        "node-pty-prebuilt-multiarch": "^0.10.1-pre.5",
+        "node-gyp": "^10.1.0",
+        "py": "npm:@bjia56/portable-python@^0.1.31",
        "router": "^1.3.8",
-        "semver": "^7.5.4",
-        "sharp": "^0.33.1",
+        "semver": "^7.6.2",
+        "sharp": "^0.33.3",
        "source-map-support": "^0.5.21",
-        "tar": "^6.2.0",
+        "tar": "^7.1.0",
        "tslib": "^2.6.2",
-        "typescript": "^5.3.3",
+        "typescript": "^5.4.5",
        "whatwg-mimetype": "^4.0.0",
-        "ws": "^8.16.0"
+        "ws": "^8.17.0"
      }
    },
    "@tsconfig/node10": {
--- a/common/src/activity-timeout.ts
+++ b/common/src/activity-timeout.ts
@@ -0,0 +1,28 @@
+export function createActivityTimeout(timeout: number, timeoutCallback: () => void) {
+    let dataTimeout: NodeJS.Timeout;
+
+    let lastTime = Date.now();
+    function resetActivityTimer() {
+        lastTime = Date.now();
+    }
+
+    function clearActivityTimer() {
+        clearInterval(dataTimeout);
+    }
+
+    if (timeout) {
+        dataTimeout = setInterval(() => {
+            if (Date.now() > lastTime + timeout) {
+                clearInterval(dataTimeout);
+                dataTimeout = undefined;
+                timeoutCallback();
+            }
+        }, timeout);
+    }
+
+    resetActivityTimer();
+    return {
+        resetActivityTimer,
+        clearActivityTimer,
+    }
+}
--- a/common/src/rtsp-server.ts
+++ b/common/src/rtsp-server.ts
@@ -89,27 +89,44 @@ export const H264_NAL_TYPE_FU_B = 29;
 export const H264_NAL_TYPE_MTAP16 = 26;
 export const H264_NAL_TYPE_MTAP32 = 27;

+export const H265_NAL_TYPE_AGG = 48;
+export const H265_NAL_TYPE_VPS = 32;
+export const H265_NAL_TYPE_SPS = 33;
+export const H265_NAL_TYPE_PPS = 34;
+export const H265_NAL_TYPE_IDR_N = 19;
+export const H265_NAL_TYPE_IDR_W = 20;
+
 export function findH264NaluType(streamChunk: StreamChunk, naluType: number) {
    if (streamChunk.type !== 'h264')
        return;
    return findH264NaluTypeInNalu(streamChunk.chunks[streamChunk.chunks.length - 1].subarray(12), naluType);
 }

+export function findH265NaluType(streamChunk: StreamChunk, naluType: number) {
+    if (streamChunk.type !== 'h265')
+        return;
+    return findH265NaluTypeInNalu(streamChunk.chunks[streamChunk.chunks.length - 1].subarray(12), naluType);
+}
+
+export function parseH264NaluType(firstNaluByte: number) {
+    return firstNaluByte & 0x1f;
+}
+
 export function findH264NaluTypeInNalu(nalu: Buffer, naluType: number) {
-    const checkNaluType = nalu[0] & 0x1f;
+    const checkNaluType = parseH264NaluType(nalu[0]);
    if (checkNaluType === H264_NAL_TYPE_STAP_A) {
        let pos = 1;
        while (pos < nalu.length) {
            const naluLength = nalu.readUInt16BE(pos);
            pos += 2;
-            const stapaType = nalu[pos] & 0x1f;
+            const stapaType = parseH264NaluType(nalu[pos]);
            if (stapaType === naluType)
                return nalu.subarray(pos, pos + naluLength);
            pos += naluLength;
        }
    }
    else if (checkNaluType === H264_NAL_TYPE_FU_A) {
-        const fuaType = nalu[1] & 0x1f;
+        const fuaType = parseH264NaluType(nalu[1]);
        const isFuStart = !!(nalu[1] & 0x80);

        if (fuaType === naluType && isFuStart)
@@ -121,39 +138,52 @@ export function findH264NaluTypeInNalu(nalu: Buffer, naluType: number) {
    return;
 }

+function parseH265NaluType(firstNaluByte: number) {
+    return (firstNaluByte & 0b01111110) >> 1;
+}
+
+export function findH265NaluTypeInNalu(nalu: Buffer, naluType: number) {
+    const checkNaluType = parseH265NaluType(nalu[0]);
+    if (checkNaluType === H265_NAL_TYPE_AGG) {
+        let pos = 1;
+        while (pos < nalu.length) {
+            const naluLength = nalu.readUInt16BE(pos);
+            pos += 2;
+            const stapaType = parseH265NaluType(nalu[pos]);
+            if (stapaType === naluType)
+                return nalu.subarray(pos, pos + naluLength);
+            pos += naluLength;
+        }
+    }
+    else if (checkNaluType === naluType) {
+        return nalu;
+    }
+    return;
+}
+
 export function getNaluTypes(streamChunk: StreamChunk) {
    if (streamChunk.type !== 'h264')
        return new Set<number>();
    return getNaluTypesInNalu(streamChunk.chunks[streamChunk.chunks.length - 1].subarray(12))
 }

-export function getNaluFragmentInformation(nalu: Buffer) {
-    const naluType = nalu[0] & 0x1f;
-    const fua = naluType === H264_NAL_TYPE_FU_A;
-    return {
-        fua,
-        fuaStart: fua && !!(nalu[1] & 0x80),
-        fuaEnd: fua && !!(nalu[1] & 0x40),
-    }
-}
-
 export function getNaluTypesInNalu(nalu: Buffer, fuaRequireStart = false, fuaRequireEnd = false) {
    const ret = new Set<number>();
-    const naluType = nalu[0] & 0x1f;
+    const naluType = parseH264NaluType(nalu[0]);
    if (naluType === H264_NAL_TYPE_STAP_A) {
        ret.add(H264_NAL_TYPE_STAP_A);
        let pos = 1;
        while (pos < nalu.length) {
            const naluLength = nalu.readUInt16BE(pos);
            pos += 2;
-            const stapaType = nalu[pos] & 0x1f;
+            const stapaType = parseH264NaluType(nalu[pos]);
            ret.add(stapaType);
            pos += naluLength;
        }
    }
    else if (naluType === H264_NAL_TYPE_FU_A) {
        ret.add(H264_NAL_TYPE_FU_A);
-        const fuaType = nalu[1] & 0x1f;
+        const fuaType = parseH264NaluType(nalu[1]);
        if (fuaRequireStart) {
            const isFuStart = !!(nalu[1] & 0x80);
            if (isFuStart)
@@ -175,6 +205,33 @@ export function getNaluTypesInNalu(nalu: Buffer, fuaRequireStart = false, fuaReq
    return ret;
 }

+export function getH265NaluTypes(streamChunk: StreamChunk) {
+    if (streamChunk.type !== 'h265')
+        return new Set<number>();
+    return getNaluTypesInH265Nalu(streamChunk.chunks[streamChunk.chunks.length - 1].subarray(12))
+}
+
+export function getNaluTypesInH265Nalu(nalu: Buffer, fuaRequireStart = false, fuaRequireEnd = false) {
+    const ret = new Set<number>();
+    const naluType = parseH265NaluType(nalu[0]);
+    if (naluType === H265_NAL_TYPE_AGG) {
+        ret.add(H265_NAL_TYPE_AGG);
+        let pos = 1;
+        while (pos < nalu.length) {
+            const naluLength = nalu.readUInt16BE(pos);
+            pos += 2;
+            const stapaType = parseH265NaluType(nalu[pos]);
+            ret.add(stapaType);
+            pos += naluLength;
+        }
+    }
+    else {
+        ret.add(naluType);
+    }
+
+    return ret;
+}
+
 export function createRtspParser(options?: StreamParserOptions): RtspStreamParser {
    let resolve: any;

@@ -195,12 +252,23 @@ export function createRtspParser(options?: StreamParserOptions): RtspStreamParse
        findSyncFrame(streamChunks: StreamChunk[]) {
            for (let prebufferIndex = 0; prebufferIndex < streamChunks.length; prebufferIndex++) {
                const streamChunk = streamChunks[prebufferIndex];
-                if (streamChunk.type !== 'h264') {
-                    continue;
+                if (streamChunk.type === 'h264') {
+                    const naluTypes = getNaluTypes(streamChunk);
+                    if (naluTypes.has(H264_NAL_TYPE_SPS) || naluTypes.has(H264_NAL_TYPE_IDR)) {
+                        return streamChunks.slice(prebufferIndex);
+                    }
                }
+                else if (streamChunk.type === 'h265') {
+                    const naluTypes = getH265NaluTypes(streamChunk);

-                if (findH264NaluType(streamChunk, H264_NAL_TYPE_SPS) || findH264NaluType(streamChunk, H264_NAL_TYPE_IDR)) {
-                    return streamChunks.slice(prebufferIndex);
+                    if (naluTypes.has(H265_NAL_TYPE_VPS)
+                        || naluTypes.has(H265_NAL_TYPE_SPS)
+                        || naluTypes.has(H265_NAL_TYPE_PPS)
+                        || naluTypes.has(H265_NAL_TYPE_IDR_N)
+                        || naluTypes.has(H265_NAL_TYPE_IDR_W)
+                    ) {
+                        return streamChunks.slice(prebufferIndex);
+                    }
                }
            }

@@ -540,6 +608,7 @@ export class RtspClient extends RtspBase {
            throw new Error('no WWW-Authenticate found');

        const { BASIC } = await import('http-auth-utils');
+        // @ts-ignore
        const { parseHTTPHeadersQuotedKeyValueSet } = await import('http-auth-utils/dist/utils');

        if (this.wwwAuthenticate.includes('Basic')) {
--- a/install/config.yaml
+++ b/install/config.yaml
@@ -1,13 +1,12 @@
 # Home Assistant Addon Configuration
 name: Scrypted
-version: "20-jammy-full.s6-v0.97.0"
+version: "v0.111.0-jammy-full"
 slug: scrypted
 description: Scrypted is a high performance home video integration and automation platform
 url: "https://github.com/koush/scrypted"
 arch:
  - amd64
  - aarch64
-  - armv7
 init: false
 ingress: true
 ingress_port: 11080
--- a/install/docker/Dockerfile.nvidia
+++ b/install/docker/Dockerfile.nvidia
@@ -1,14 +1,6 @@
-FROM ghcr.io/koush/scrypted:20-jammy-full.s6
+ARG BASE="ghcr.io/koush/scrypted-common:20-jammy-full"
+FROM $BASE

-WORKDIR /
-
-# Install miniconda
-ENV CONDA_DIR /opt/conda
-RUN apt update -y && apt -y install wget && wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
-     /bin/bash ~/miniconda.sh -b -p /opt/conda
-# Put conda in path so we can use conda activate
-ENV PATH=$CONDA_DIR/bin:$PATH
-
-RUN conda -y install -c conda-forge cudatoolkit cudnn
-ENV CONDA_PREFIX=/opt/conda
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CONDA_PREFIX/lib/
+# nvidia cudnn/libcublas etc.
+# for some reason this is not provided by the nvidia container toolkit
+RUN curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-nvidia-graphics.sh | bash
--- a/install/docker/docker-compose.yml
+++ b/install/docker/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.5"
-
 # The Scrypted docker-compose.yml file typically resides at:
 # ~/.scrypted/docker-compose.yml

@@ -37,17 +35,24 @@ services:
            # Avahi can be used for network discovery by passing in the host daemon
            # or running the daemon inside the container. Choose one or the other.
            # Uncomment next line to run avahi-daemon inside the container.
-            # See volumes section below to use the host daemon.
+            # See volumes and security_opt section below to use the host daemon.
            # - SCRYPTED_DOCKER_AVAHI=true

-            # Uncomment next 3 lines for Nvidia GPU support.
+            # NVIDIA (Part 1 of 4)
            # - NVIDIA_VISIBLE_DEVICES=all
            # - NVIDIA_DRIVER_CAPABILITIES=all
+
+        # NVIDIA (Part 2 of 4)
        # runtime: nvidia
-        # Necessary to communicate with host dbus for avahi-daemon.
-        security_opt:
-            - apparmor:unconfined
+
+        # NVIDIA (Part 3 of 4) - Use NVIDIA image, and remove subsequent default image.
+        # image: ghcr.io/koush/scrypted:nvidia
+        image: ghcr.io/koush/scrypted
+
        volumes:
+            # NVIDIA (Part 4 of 4)
+            # - /etc/OpenCL/vendors/nvidia.icd:/etc/OpenCL/vendors/nvidia.icd
+
            # Scrypted NVR Storage (Part 3 of 3)

            # Modify to add the additional volume for Scrypted NVR.
@@ -66,11 +71,16 @@ services:
            # Ensure Avahi is running on the host machine:
            # It can be installed with: sudo apt-get install avahi-daemon
            # This is not compatible with running avahi inside the container (see above).
+            # Also, uncomment the lines under security_opt
            # - /var/run/dbus:/var/run/dbus
            # - /var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket

            # Default volume for the Scrypted database. Typically should not be changed.
            - ~/.scrypted/volume:/server/volume
+        # Uncomment the following lines to use Avahi daemon from the host
+        # Without this, AppArmor will block the container's attempt to talk to Avahi via dbus
+        # security_opt:
+        #     - apparmor:unconfined
        devices: [
            # uncomment the common systems devices to pass
            # them through to docker.
@@ -94,15 +104,16 @@ services:
        container_name: scrypted
        restart: unless-stopped
        network_mode: host
-        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.
+        # enable the log file if enhanced debugging is necessary.
        logging:
-            driver: "json-file"
-            options:
-                max-size: "10m"
-                max-file: "10"
+            driver: "none"
+            # driver: "json-file"
+            # options:
+            #     max-size: "10m"
+            #     max-file: "10"
        labels:
            - "com.centurylinklabs.watchtower.scope=scrypted"

--- a/install/docker/install-intel-graphics.sh
+++ b/install/docker/install-intel-graphics.sh
@@ -1,13 +1,35 @@
 if [ "$(uname -m)" = "x86_64" ]
 then
-    echo "Installing Intel graphics packages."
-    apt-get update && apt-get install -y gpg-agent &&
-    rm -f /usr/share/keyrings/intel-graphics.gpg &&
-    curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg &&
-    echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee  /etc/apt/sources.list.d/intel.gpu.jammy.list &&
-    apt-get -y update &&
-    apt-get -y install intel-opencl-icd intel-media-va-driver-non-free &&
+    # this script previvously apt install intel-media-va-driver-non-free, but that seems to no longer be necessary.
+
+    # the intel provided script is disabled since it does not work with the 6.8 kernel in Ubuntu 24.04 or Proxmox 8.2.
+    # manual installation of the Intel graphics stuff is required.
+
+    # echo "Installing Intel graphics packages."
+    # apt-get update && apt-get install -y gpg-agent &&
+    # rm -f /usr/share/keyrings/intel-graphics.gpg &&
+    # curl -L https://repositories.intel.com/graphics/intel-graphics.key | gpg --dearmor --yes --output /usr/share/keyrings/intel-graphics.gpg &&
+    # echo 'deb [arch=amd64,i386 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/graphics/ubuntu jammy arc' | tee  /etc/apt/sources.list.d/intel.gpu.jammy.list &&
+    # apt-get -y update &&
+    # apt-get -y install intel-opencl-icd &&
+    # apt-get -y dist-upgrade;
+
+    # manual installation
+    # https://github.com/intel/compute-runtime/releases/tag/24.13.29138.7
+
+    rm -rf /tmp/neo && mkdir -p /tmp/neo && cd /tmp/neo &&
+    apt-get install -y ocl-icd-libopencl1 &&
+    curl -O -L https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.16695.4/intel-igc-core_1.0.16695.4_amd64.deb &&
+    curl -O -L https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.16695.4/intel-igc-opencl_1.0.16695.4_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.17.29377.6/intel-level-zero-gpu-dbgsym_1.3.29377.6_amd64.ddeb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.17.29377.6/intel-level-zero-gpu_1.3.29377.6_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.17.29377.6/intel-opencl-icd-dbgsym_24.17.29377.6_amd64.ddeb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.17.29377.6/intel-opencl-icd_24.17.29377.6_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.17.29377.6/libigdgmm12_22.3.19_amd64.deb &&
+    dpkg -i *.deb &&
+    cd /tmp && rm -rf /tmp/neo &&
    apt-get -y dist-upgrade;
+
    exit $?
 else
    echo "Intel graphics will not be installed on this architecture."
--- a/install/docker/install-nvidia-graphics.sh
+++ b/install/docker/install-nvidia-graphics.sh
@@ -0,0 +1,16 @@
+if [ "$(uname -m)" = "x86_64" ]
+then
+    echo "Installing NVIDIA graphics packages."
+    apt update -q \
+        && apt install -y wget \
+        && wget -qO /cuda-keyring.deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/$(uname -m)/cuda-keyring_1.1-1_all.deb \
+        && dpkg -i /cuda-keyring.deb \
+        && apt update -q \
+        && apt install -y cuda-nvcc-11-8 libcublas-11-8 libcudnn8 cuda-libraries-11-8 \
+        && apt install -y cuda-nvcc-12-4 libcublas-12-4 libcudnn8 cuda-libraries-12-4;
+    exit $?
+else
+    echo "NVIDIA graphics will not be installed on this architecture."
+fi
+
+exit 0
--- a/install/docker/install-scrypted-docker-compose.sh
+++ b/install/docker/install-scrypted-docker-compose.sh
@@ -61,6 +61,8 @@ then
    sudo apt-get -y install avahi-daemon
    sed -i 's/'#' - \/var\/run\/dbus/- \/var\/run\/dbus/g' $DOCKER_COMPOSE_YML
    sed -i 's/'#' - \/var\/run\/avahi-daemon/- \/var\/run\/avahi-daemon/g' $DOCKER_COMPOSE_YML
+    sed -i 's/'#' security_opt:/security_opt:/g' $DOCKER_COMPOSE_YML
+    sed -i 's/'#'     - apparmor:unconfined/    - apparmor:unconfined/g' $DOCKER_COMPOSE_YML
 fi

 echo "Setting permissions on $SCRYPTED_HOME"
--- a/install/docker/setup-scrypted-nvr-volume.sh
+++ b/install/docker/setup-scrypted-nvr-volume.sh
@@ -72,6 +72,7 @@ function removescryptedfstab() {
    grep -v "scrypted-nvr" /etc/fstab > /tmp/fstab && cp /tmp/fstab /etc/fstab
    # ensure newline
    sed -i -e '$a\' /etc/fstab
+    systemctl daemon-reload
 }

 BLOCK_DEVICE="/dev/$1"
@@ -95,7 +96,17 @@ then
    set +e

    sync
-    mkfs -F -t ext4 "$BLOCK_DEVICE"1
+    PARTITION_DEVICE="$BLOCK_DEVICE"1
+    if [ ! -e "$PARTITION_DEVICE" ]
+    then
+        PARTITION_DEVICE="$BLOCK_DEVICE"p1
+        if [ ! -e "$PARTITION_DEVICE" ]
+        then
+            echo "Unable to determine block device partition from block device: $BLOCK_DEVICE"
+            exit 1
+        fi
+    fi
+    mkfs -F -t ext4 "$PARTITION_DEVICE"
    sync

    # parse/evaluate blkid line as env vars
@@ -119,6 +130,7 @@ then
    mkdir -p /mnt/scrypted-nvr
    echo "PARTLABEL=scrypted-nvr     /mnt/scrypted-nvr    ext4   defaults,nofail 0 0" >> /etc/fstab
    mount -a
+    systemctl daemon-reload
    set +e

    DIR="/mnt/scrypted-nvr"
--- a/install/local/install-scrypted-dependencies-linux.sh
+++ b/install/local/install-scrypted-dependencies-linux.sh
@@ -97,7 +97,7 @@ echo "docker compose rm -rf"
 sudo -u $SERVICE_USER docker rm -f /scrypted /scrypted-watchtower 2> /dev/null

 echo "Installing Scrypted..."
-RUN sudo -u $SERVICE_USER npx -y scrypted@latest install-server
+RUN sudo -u $SERVICE_USER npx -y scrypted@latest install-server $SCRYPTED_INSTALL_VERSION

 cat > /etc/systemd/system/scrypted.service <<EOT

@@ -110,10 +110,12 @@ User=$SERVICE_USER
 Group=$SERVICE_USER
 Type=simple
 ExecStart=/usr/bin/npx -y scrypted serve
-Restart=on-failure
+Restart=always
 RestartSec=3
 Environment="NODE_OPTIONS=$NODE_OPTIONS"
 Environment="SCRYPTED_INSTALL_ENVIRONMENT=$SCRYPTED_INSTALL_ENVIRONMENT"
+StandardOutput=null
+StandardError=null

 [Install]
 WantedBy=multi-user.target
--- a/install/local/install-scrypted-dependencies-mac.sh
+++ b/install/local/install-scrypted-dependencies-mac.sh
@@ -121,7 +121,7 @@ then
 fi

 echo "Installing Scrypted..."
-RUN $NPX_PATH -y scrypted@latest install-server
+RUN $NPX_PATH -y scrypted@latest install-server $SCRYPTED_INSTALL_VERSION

 cat > ~/Library/LaunchAgents/app.scrypted.server.plist <<EOT
 <?xml version="1.0" encoding="UTF-8"?>
--- a/install/local/install-scrypted-dependencies-win.ps1
+++ b/install/local/install-scrypted-dependencies-win.ps1
@@ -11,7 +11,7 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/in
 choco upgrade -y nodejs-lts --version=20.11.1

 # Install VC Redist, which is necessary for portable python
-choco install vcredist140
+choco install -y vcredist140

 # TODO: remove python install, and use portable python
 # Install Python
@@ -26,7 +26,12 @@ $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";"
 py $SCRYPTED_WINDOWS_PYTHON_VERSION -m pip install --upgrade pip
 py $SCRYPTED_WINDOWS_PYTHON_VERSION -m pip install debugpy typing_extensions typing opencv-python

-npx -y scrypted@latest install-server
+$SCRYPTED_INSTALL_VERSION=[System.Environment]::GetEnvironmentVariable("SCRYPTED_INSTALL_VERSION","User")
+if ($SCRYPTED_INSTALL_VERSION -eq $null) {
+  npx -y scrypted@latest install-server
+} else {
+  npx -y scrypted@latest install-server $SCRYPTED_INSTALL_VERSION 
+}

 $USER_HOME_ESCAPED = $env:USERPROFILE.replace('\', '\\')
 $SCRYPTED_HOME = $env:USERPROFILE + '\.scrypted'
@@ -34,7 +39,8 @@ $SCRYPTED_HOME_ESCAPED_PATH = $SCRYPTED_HOME.replace('\', '\\')
 npm install --prefix $SCRYPTED_HOME @koush/node-windows --save

 $NPX_PATH = (Get-Command npx).Path
-$NPX_PATH_ESCAPED = $NPX_PATH.replace('\', '\\')
+# The path needs double quotes to handle spaces in the directory path
+$NPX_PATH_ESCAPED = '"' + $NPX_PATH.replace('\', '\\') + '"'

 $SERVICE_JS = @"
 const fs = require('fs');
@@ -44,8 +50,10 @@ try {
 catch (e) {
 }
 const child_process = require('child_process');
-child_process.spawn('$($NPX_PATH_ESCAPED)', ['-y', 'scrypted', 'serve'], {
+child_process.spawn('$NPX_PATH_ESCAPED', ['-y', 'scrypted', 'serve'], {
    stdio: 'inherit',
+    // allow spawning .cmd https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
+    shell: true,
 });
 "@

--- a/install/local/install-scrypted-proxmox.sh
+++ b/install/local/install-scrypted-proxmox.sh
@@ -41,12 +41,19 @@ pct restore $VMID $SCRYPTED_TAR_ZST $@
 if [ "$?" != "0" ]
 then
    echo ""
-    echo "pct restore failed"
+    echo "The Scrypted container installation failed (pct restore error)."
    echo ""
-    echo "This may be caused by the server's 'local' storage not supporting containers."
-    echo "Try running this script again with a different storage device (local-lvm, local-zfs). For example:"
+    echo "This may be because the server's 'local' storage device is not being a valid"
+    echo "location for containers."
+    echo "Try running this script again with a different storage device like"
+    echo "'local-lvm' or 'local-zfs'."
+    echo ""
+    echo "#############################################################################"
+    echo "Paste the following command into this shell to install to local-lvm instead:"
    echo ""
    echo "bash $0 --storage local-lvm"
+    echo "#############################################################################"
+    echo ""
    echo ""
    exit 1
 fi
--- a/npm-install.sh
+++ b/npm-install.sh
@@ -1,10 +1,4 @@
 #!/bin/bash
-echo 'if (!process.version.startsWith("v18")) throw new Error("Node 18 is required. Install Node Version Manager (nvm) for versioned node installations. See https://github.com/koush/scrypted/pull/498#issuecomment-1373854020")' | node
-if [ "$?" != 0 ]
-then
-    exit
-fi
-
 echo ######################################
 echo "Setting up popular plugins."
 echo "Additional will need npm install manually."
@@ -15,7 +9,7 @@ cd $(dirname $0)
 git submodule init
 git submodule update

-for directory in sdk common server packages/client packages/auth-fetch
+for directory in sdk server common packages/client packages/auth-fetch
 do
    echo "$directory > npm install"
    pushd $directory
--- a/packages/auth-fetch/src/auth-fetch.ts
+++ b/packages/auth-fetch/src/auth-fetch.ts
@@ -1,4 +1,4 @@
-import { HttpFetchOptions, HttpFetchResponseType, checkStatus, fetcher, getFetchMethod, setDefaultHttpFetchAccept } from '../../../server/src/fetch';
+import { HttpFetchOptions, HttpFetchResponseType, checkStatus, createHeadersArray, fetcher, getFetchMethod, hasHeader, setDefaultHttpFetchAccept, setHeader } from '../../../server/src/fetch';

 export interface AuthFetchCredentialState {
    username: string;
@@ -70,19 +70,19 @@ async function getAuth(options: AuthFetchOptions, url: string | URL, method: str

 export function createAuthFetch<B, M>(
    h: fetcher<B, M>,
-    parser: (body: M, responseType: HttpFetchResponseType) => Promise<any>
+    parser: (body: M, responseType: HttpFetchResponseType | undefined) => Promise<any>
 ) {
    const authHttpFetch = async <T extends HttpFetchOptions<B>>(options: T & AuthFetchOptions): ReturnType<typeof h<T>> => {
        const method = getFetchMethod(options);
-        const headers = new Headers(options.headers);
+        const headers = createHeadersArray(options.headers);
        options.headers = headers;
        setDefaultHttpFetchAccept(headers, options.responseType);

        const initialHeader = await getAuth(options, options.url, method);
        // try to provide an authorization if a session exists, but don't override Authorization if provided already.
        // 401 will trigger a proper auth.
-        if (initialHeader && !headers.has('Authorization'))
-            headers.set('Authorization', initialHeader);
+        if (initialHeader && !hasHeader(headers, 'Authorization'))
+            setHeader(headers, 'Authorization', initialHeader);

        const initialResponse = await h({
            ...options,
@@ -99,7 +99,7 @@ export function createAuthFetch<B, M>(
            };
        }

-        let authenticateHeaders: string | string[] = initialResponse.headers.get('www-authenticate');
+        let authenticateHeaders: string | string[] | null = initialResponse.headers.get('www-authenticate');
        if (!authenticateHeaders)
            throw new Error('Did not find WWW-Authenticate header.');

@@ -126,7 +126,7 @@ export function createAuthFetch<B, M>(

        const header = await getAuth(options, options.url, method);
        if (header)
-            headers.set('Authorization', header);
+            setHeader(headers, 'Authorization', header);

        return h(options);
    }
--- a/packages/auth-fetch/tsconfig.json
+++ b/packages/auth-fetch/tsconfig.json
@@ -9,6 +9,7 @@
        "inlineSources": true,
        "declaration": true,
        "resolveJsonModule": true,
+        "strict": true
    },
    "include": [
        "src/**/*"
--- a/packages/cli/package-lock.json
+++ b/packages/cli/package-lock.json
@@ -1,16 +1,16 @@
 {
  "name": "scrypted",
-  "version": "1.3.14",
+  "version": "1.3.16",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "scrypted",
-      "version": "1.3.14",
+      "version": "1.3.16",
      "license": "ISC",
      "dependencies": {
        "@scrypted/client": "^1.3.3",
-        "@scrypted/types": "^0.2.99",
+        "@scrypted/types": "^0.3.30",
        "engine.io-client": "^6.5.3",
        "readline-sync": "^1.4.10",
        "semver": "^7.5.4",
@@ -101,15 +101,11 @@
        "rimraf": "^5.0.5"
      }
    },
-    "node_modules/@scrypted/client/node_modules/@scrypted/types": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.3.4.tgz",
-      "integrity": "sha512-k/YMx8lIWOkePgXfKW9POr12mb+erFU2JKxO7TW92GyW8ojUWw9VOc0PK6O9bybi0vhsEnvMFkO6pO6bAonsVA=="
-    },
    "node_modules/@scrypted/types": {
-      "version": "0.2.99",
-      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.2.99.tgz",
-      "integrity": "sha512-2J1FH7tpAW5X3rgA70gJ+z0HFM90c/tBA+JXdP1vI1d/0yVmh9TSxnHoCuADN4R2NQXHmoZ6Nbds9kKAQ/25XQ=="
+      "version": "0.3.30",
+      "resolved": "https://registry.npmjs.org/@scrypted/types/-/types-0.3.30.tgz",
+      "integrity": "sha512-1k+JVSR6WSNmE/5mLdqfrTmV3uRbvZp0OwKb8ikNi39ysBuC000tQGcEdXZqhYqRgWdhDTWtxXe9XsYoAZGKmA==",
+      "license": "ISC"
    },
    "node_modules/@socket.io/component-emitter": {
      "version": "3.1.0",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "scrypted",
-  "version": "1.3.14",
+  "version": "1.3.16",
  "description": "",
  "main": "./dist/packages/cli/src/main.js",
  "bin": {
@@ -17,7 +17,7 @@
  "license": "ISC",
  "dependencies": {
    "@scrypted/client": "^1.3.3",
-    "@scrypted/types": "^0.2.99",
+    "@scrypted/types": "^0.3.30",
    "engine.io-client": "^6.5.3",
    "readline-sync": "^1.4.10",
    "semver": "^7.5.4",
--- a/packages/cli/src/main.ts
+++ b/packages/cli/src/main.ts
@@ -160,11 +160,11 @@ async function main() {
        const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(await pendingResult, ScryptedMimeTypes.FFmpegInput);
        if (ffmpegInput.url && ffmpegInput.urls?.[0]) {
            const url = new URL(ffmpegInput.url);
-            if (url.hostname === '127.0.0.1' && ffmpegInput.urls?.[0]) {
-                ffmpegInput.inputArguments = ffmpegInput.inputArguments.map(i => i === ffmpegInput.url ? ffmpegInput.urls?.[0] : i);
+            if (url.hostname === '127.0.0.1' && ffmpegInput.urls?.[0] && ffmpegInput.inputArguments) {
+                ffmpegInput.inputArguments = ffmpegInput.inputArguments.map(i => i === ffmpegInput.url && ffmpegInput.urls ? ffmpegInput.urls?.[0] : i);
            }
        }
-        const args = [...ffmpegInput.inputArguments];
+        const args = ffmpegInput.inputArguments ? [...ffmpegInput.inputArguments] : [];
        if (ffmpegInput.h264FilterArguments)
            args.push(...ffmpegInput.h264FilterArguments);
        console.log('ffplay', ...args);
--- a/packages/cli/src/service.ts
+++ b/packages/cli/src/service.ts
@@ -14,8 +14,12 @@ const EXIT_FILE = '.exit';
 const UPDATE_FILE = '.update';

 async function runCommand(command: string, ...args: string[]) {
-    if (os.platform() === 'win32')
+    if (os.platform() === 'win32') {
        command += '.cmd';
+        // wrap each argument in a quote to handle spaces in paths
+        // https://github.com/nodejs/node/issues/38490#issuecomment-927330248
+        args = args.map(arg => '"' + arg + '"');
+    }
    console.log('running', command, ...args);
    const cp = child_process.spawn(command, args, {
        stdio: 'inherit',
@@ -24,6 +28,8 @@ async function runCommand(command: string, ...args: string[]) {
            // https://github.com/lovell/sharp/blob/eefaa998725cf345227d94b40615e090495c6d09/lib/libvips.js#L115C19-L115C46
            SHARP_IGNORE_GLOBAL_LIBVIPS: 'true',
        },
+        // allow spawning .cmd https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2
+        shell: os.platform() === 'win32' ? true : undefined,
    });
    await once(cp, 'exit');
    if (cp.exitCode)
@@ -84,7 +90,13 @@ export async function installServe(installVersion: string, ignoreError?: boolean
    const installJson = path.join(installDir, 'install.json');
    try {
        const { version } = JSON.parse(fs.readFileSync(installJson).toString());
-        if (semver.parse(process.version).major !== semver.parse(version).major)
+        const processSemver = semver.parse(process.version);
+        if (!processSemver)
+            throw new Error('error parsing process version');
+        const installSemver = semver.parse(version);
+        if (!installSemver)
+            throw new Error('error parsing install.json version');
+        if (processSemver.major !== installSemver.major)
            throw new Error('mismatch');
    }
    catch (e) {
@@ -105,16 +117,32 @@ export async function installServe(installVersion: string, ignoreError?: boolean
 }

 export async function serveMain(installVersion?: string) {
-    let install = !!installVersion;
+    const options = ((): { install: true; version: string } | { install: false } => {
+        if (installVersion) {
+            console.log(`Installing @scrypted/server@${installVersion}`);
+            return {
+                install: true, 
+                version: installVersion
+            };
+        }
+
+        if (!fs.existsSync('node_modules/@scrypted/server')) {
+            console.log('Package @scrypted/server not found. Installing.');
+            return {
+                install: true,
+                version: 'latest',
+            };
+        }
+
+        return {
+            install: false,
+        }
+    })();

    const { installDir, volume } = cwdInstallDir();
-    if (!fs.existsSync('node_modules/@scrypted/server')) {
-        install = true;
-        installVersion ||= 'latest';
-        console.log('Package @scrypted/server not found. Installing.');
-    }
-    if (install) {
-        await installServe(installVersion, true);
+
+    if (options.install) {
+        await installServe(options.version, true);
    }

    // todo: remove at some point after core lxc updater rolls out.
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -9,6 +9,7 @@
      "inlineSources": true,
      "declaration": true,
      "moduleResolution": "Node16",
+      "strict": true
  },
  "include": [
      "src/**/*"
--- a/plugins/amcrest/package-lock.json
+++ b/plugins/amcrest/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/amcrest",
-   "version": "0.0.150",
+   "version": "0.0.151",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/amcrest",
-         "version": "0.0.150",
+         "version": "0.0.151",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/amcrest/package.json
+++ b/plugins/amcrest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/amcrest",
-   "version": "0.0.150",
+   "version": "0.0.151",
   "description": "Amcrest Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/amcrest/src/amcrest-api.ts
+++ b/plugins/amcrest/src/amcrest-api.ts
@@ -134,7 +134,7 @@ export interface AmcrestEventData {
 export enum AmcrestEvent {
    MotionStart = "Code=VideoMotion;action=Start",
    MotionStop = "Code=VideoMotion;action=Stop",
-    MotionInfo  = "Code=VideoMotionInfo;action=State",
+    MotionInfo = "Code=VideoMotionInfo;action=State",
    AudioStart = "Code=AudioMutation;action=Start",
    AudioStop = "Code=AudioMutation;action=Stop",
    TalkInvite = "Code=_DoTalkAction_;action=Invite",
@@ -263,6 +263,8 @@ export class AmcrestCameraClient {
        // make content type parsable as content disposition filename
        const cd = contentType.parse(ct);
        let { boundary } = cd.parameters;
+        // amcrest may send "--myboundary" or "-- myboundary" (with a space)
+        const altBoundary = `-- ${boundary}`;
        boundary = `--${boundary}`;
        const boundaryEnd = `${boundary}--`;

@@ -286,7 +288,7 @@ export class AmcrestCameraClient {
                        this.console.log('ignoring dahua http body', body);
                    continue;
                }
-                if (ignore !== boundary) {
+                if (ignore !== boundary && ignore !== altBoundary) {
                    this.console.error('expected boundary but found', ignore);
                    this.console.error(response.headers);
                    throw new Error('expected boundary');
--- a/plugins/bticino/package-lock.json
+++ b/plugins/bticino/package-lock.json
@@ -1,29 +1,26 @@
 {
   "name": "@scrypted/bticino",
-   "version": "0.0.15",
+   "version": "0.0.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/bticino",
-         "version": "0.0.15",
+         "version": "0.0.16",
         "dependencies": {
            "@slyoldfox/sip": "^0.0.6-1",
            "sdp": "^3.0.3",
-            "stun": "^2.1.0",
-            "uuid": "^8.3.2"
+            "stun": "^2.1.0"
         },
         "devDependencies": {
            "@scrypted/common": "file:../../common",
            "@scrypted/sdk": "file:../../sdk",
            "@types/node": "^16.9.6",
-            "@types/uuid": "^8.3.4",
            "cross-env": "^7.0.3",
            "ts-node": "^10.9.1"
         }
      },
      "../../common": {
-         "name": "@scrypted/common",
         "version": "1.0.1",
         "dev": true,
         "license": "ISC",
@@ -39,8 +36,7 @@
         }
      },
      "../../sdk": {
-         "name": "@scrypted/sdk",
-         "version": "0.3.14",
+         "version": "0.3.29",
         "dev": true,
         "license": "ISC",
         "dependencies": {
@@ -89,18 +85,18 @@
         }
      },
      "node_modules/@jridgewell/resolve-uri": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-         "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+         "version": "3.1.2",
+         "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+         "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
         "dev": true,
         "engines": {
            "node": ">=6.0.0"
         }
      },
      "node_modules/@jridgewell/sourcemap-codec": {
-         "version": "1.4.14",
-         "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-         "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+         "version": "1.4.15",
+         "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+         "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
         "dev": true
      },
      "node_modules/@jridgewell/trace-mapping": {
@@ -130,9 +126,9 @@
         }
      },
      "node_modules/@tsconfig/node10": {
-         "version": "1.0.9",
-         "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-         "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+         "version": "1.0.11",
+         "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+         "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
         "dev": true
      },
      "node_modules/@tsconfig/node12": {
@@ -148,27 +144,21 @@
         "dev": true
      },
      "node_modules/@tsconfig/node16": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-         "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+         "version": "1.0.4",
+         "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+         "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
         "dev": true
      },
      "node_modules/@types/node": {
-         "version": "16.18.16",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.16.tgz",
-         "integrity": "sha512-ZOzvDRWp8dCVBmgnkIqYCArgdFOO9YzocZp8Ra25N/RStKiWvMOXHMz+GjSeVNe5TstaTmTWPucGJkDw0XXJWA==",
-         "dev": true
-      },
-      "node_modules/@types/uuid": {
-         "version": "8.3.4",
-         "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-         "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+         "version": "16.18.96",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.96.tgz",
+         "integrity": "sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==",
         "dev": true
      },
      "node_modules/acorn": {
-         "version": "8.8.2",
-         "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-         "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+         "version": "8.11.3",
+         "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+         "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
         "dev": true,
         "bin": {
            "acorn": "bin/acorn"
@@ -178,9 +168,9 @@
         }
      },
      "node_modules/acorn-walk": {
-         "version": "8.2.0",
-         "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-         "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+         "version": "8.3.2",
+         "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+         "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
         "dev": true,
         "engines": {
            "node": ">=0.4.0"
@@ -229,12 +219,18 @@
         }
      },
      "node_modules/call-bind": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-         "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+         "version": "1.0.7",
+         "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+         "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
         "dependencies": {
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2"
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "set-function-length": "^1.2.1"
+         },
+         "engines": {
+            "node": ">= 0.4"
         },
         "funding": {
            "url": "https://github.com/sponsors/ljharb"
@@ -365,6 +361,22 @@
            "node": ">=0.10"
         }
      },
+      "node_modules/define-data-property": {
+         "version": "1.1.4",
+         "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+         "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+         "dependencies": {
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "gopd": "^1.0.1"
+         },
+         "engines": {
+            "node": ">= 0.4"
+         },
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
+         }
+      },
      "node_modules/diff": {
         "version": "4.0.2",
         "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -382,6 +394,25 @@
            "is-arrayish": "^0.2.1"
         }
      },
+      "node_modules/es-define-property": {
+         "version": "1.0.0",
+         "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+         "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+         "dependencies": {
+            "get-intrinsic": "^1.2.4"
+         },
+         "engines": {
+            "node": ">= 0.4"
+         }
+      },
+      "node_modules/es-errors": {
+         "version": "1.3.0",
+         "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+         "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+         "engines": {
+            "node": ">= 0.4"
+         }
+      },
      "node_modules/filter-obj": {
         "version": "1.1.0",
         "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
@@ -402,9 +433,12 @@
         }
      },
      "node_modules/function-bind": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-         "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+         "version": "1.1.2",
+         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+         "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
+         }
      },
      "node_modules/generate-function": {
         "version": "2.3.1",
@@ -415,13 +449,29 @@
         }
      },
      "node_modules/get-intrinsic": {
-         "version": "1.2.0",
-         "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-         "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+         "version": "1.2.4",
+         "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+         "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
         "dependencies": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+         },
+         "engines": {
+            "node": ">= 0.4"
+         },
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
+         }
+      },
+      "node_modules/gopd": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+         "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+         "dependencies": {
+            "get-intrinsic": "^1.1.3"
         },
         "funding": {
            "url": "https://github.com/sponsors/ljharb"
@@ -432,15 +482,26 @@
         "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
         "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
      },
-      "node_modules/has": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-         "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "node_modules/has-property-descriptors": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+         "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
         "dependencies": {
-            "function-bind": "^1.1.1"
+            "es-define-property": "^1.0.0"
         },
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
+         }
+      },
+      "node_modules/has-proto": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+         "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
         "engines": {
-            "node": ">= 0.4.0"
+            "node": ">= 0.4"
+         },
+         "funding": {
+            "url": "https://github.com/sponsors/ljharb"
         }
      },
      "node_modules/has-symbols": {
@@ -454,6 +515,17 @@
            "url": "https://github.com/sponsors/ljharb"
         }
      },
+      "node_modules/hasown": {
+         "version": "2.0.2",
+         "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+         "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+         "dependencies": {
+            "function-bind": "^1.1.2"
+         },
+         "engines": {
+            "node": ">= 0.4"
+         }
+      },
      "node_modules/hosted-git-info": {
         "version": "2.8.9",
         "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -468,9 +540,9 @@
         }
      },
      "node_modules/ip": {
-         "version": "1.1.8",
-         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-         "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+         "version": "1.1.9",
+         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+         "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
      },
      "node_modules/ip2buf": {
         "version": "2.0.0",
@@ -486,11 +558,11 @@
         "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
      },
      "node_modules/is-core-module": {
-         "version": "2.11.0",
-         "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-         "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+         "version": "2.13.1",
+         "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+         "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
         "dependencies": {
-            "has": "^1.0.3"
+            "hasown": "^2.0.0"
         },
         "funding": {
            "url": "https://github.com/sponsors/ljharb"
@@ -671,9 +743,9 @@
         }
      },
      "node_modules/object-inspect": {
-         "version": "1.12.3",
-         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-         "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+         "version": "1.13.1",
+         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+         "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
         "funding": {
            "url": "https://github.com/sponsors/ljharb"
         }
@@ -789,11 +861,11 @@
         "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="
      },
      "node_modules/qs": {
-         "version": "6.11.1",
-         "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
-         "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
+         "version": "6.12.1",
+         "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+         "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
         "dependencies": {
-            "side-channel": "^1.0.4"
+            "side-channel": "^1.0.6"
         },
         "engines": {
            "node": ">=0.6"
@@ -865,11 +937,11 @@
         }
      },
      "node_modules/resolve": {
-         "version": "1.22.1",
-         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-         "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+         "version": "1.22.8",
+         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+         "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
         "dependencies": {
-            "is-core-module": "^2.9.0",
+            "is-core-module": "^2.13.0",
            "path-parse": "^1.0.7",
            "supports-preserve-symlinks-flag": "^1.0.0"
         },
@@ -912,6 +984,22 @@
            "semver": "bin/semver"
         }
      },
+      "node_modules/set-function-length": {
+         "version": "1.2.2",
+         "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+         "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+         "dependencies": {
+            "define-data-property": "^1.1.4",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.2"
+         },
+         "engines": {
+            "node": ">= 0.4"
+         }
+      },
      "node_modules/shebang-command": {
         "version": "2.0.0",
         "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -934,13 +1022,17 @@
         }
      },
      "node_modules/side-channel": {
-         "version": "1.0.4",
-         "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-         "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+         "version": "1.0.6",
+         "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+         "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
         "dependencies": {
-            "call-bind": "^1.0.0",
-            "get-intrinsic": "^1.0.2",
-            "object-inspect": "^1.9.0"
+            "call-bind": "^1.0.7",
+            "es-errors": "^1.3.0",
+            "get-intrinsic": "^1.2.4",
+            "object-inspect": "^1.13.1"
+         },
+         "engines": {
+            "node": ">= 0.4"
         },
         "funding": {
            "url": "https://github.com/sponsors/ljharb"
@@ -961,9 +1053,9 @@
         }
      },
      "node_modules/spdx-exceptions": {
-         "version": "2.3.0",
-         "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-         "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+         "version": "2.5.0",
+         "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+         "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="
      },
      "node_modules/spdx-expression-parse": {
         "version": "3.0.1",
@@ -975,9 +1067,9 @@
         }
      },
      "node_modules/spdx-license-ids": {
-         "version": "3.0.13",
-         "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-         "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+         "version": "3.0.17",
+         "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+         "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="
      },
      "node_modules/split-on-first": {
         "version": "1.1.0",
@@ -1054,9 +1146,9 @@
         }
      },
      "node_modules/ts-node": {
-         "version": "10.9.1",
-         "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-         "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+         "version": "10.9.2",
+         "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+         "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
         "dev": true,
         "dependencies": {
            "@cspotcode/source-map-support": "^0.8.0",
@@ -1105,9 +1197,9 @@
         }
      },
      "node_modules/typescript": {
-         "version": "5.0.2",
-         "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
-         "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==",
+         "version": "5.4.5",
+         "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+         "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
         "dev": true,
         "peer": true,
         "bin": {
@@ -1115,7 +1207,7 @@
            "tsserver": "bin/tsserver"
         },
         "engines": {
-            "node": ">=12.20"
+            "node": ">=14.17"
         }
      },
      "node_modules/universalify": {
@@ -1126,14 +1218,6 @@
            "node": ">= 4.0.0"
         }
      },
-      "node_modules/uuid": {
-         "version": "8.3.2",
-         "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-         "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-         "bin": {
-            "uuid": "dist/bin/uuid"
-         }
-      },
      "node_modules/v8-compile-cache-lib": {
         "version": "3.0.1",
         "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
@@ -1193,15 +1277,15 @@
         }
      },
      "@jridgewell/resolve-uri": {
-         "version": "3.1.0",
-         "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-         "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
+         "version": "3.1.2",
+         "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+         "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
         "dev": true
      },
      "@jridgewell/sourcemap-codec": {
-         "version": "1.4.14",
-         "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-         "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+         "version": "1.4.15",
+         "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+         "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
         "dev": true
      },
      "@jridgewell/trace-mapping": {
@@ -1255,9 +1339,9 @@
         "integrity": "sha512-PJBIAKS3aMsFTHeQLfAtVpZOduAqGNZZAEH6Kb15htGUcSJWHZ9r2LAjxm3fD4yWT9plYlO0CthcEVnlrrwQLA=="
      },
      "@tsconfig/node10": {
-         "version": "1.0.9",
-         "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-         "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+         "version": "1.0.11",
+         "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
+         "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
         "dev": true
      },
      "@tsconfig/node12": {
@@ -1273,33 +1357,27 @@
         "dev": true
      },
      "@tsconfig/node16": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-         "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
+         "version": "1.0.4",
+         "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+         "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
         "dev": true
      },
      "@types/node": {
-         "version": "16.18.16",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.16.tgz",
-         "integrity": "sha512-ZOzvDRWp8dCVBmgnkIqYCArgdFOO9YzocZp8Ra25N/RStKiWvMOXHMz+GjSeVNe5TstaTmTWPucGJkDw0XXJWA==",
-         "dev": true
-      },
-      "@types/uuid": {
-         "version": "8.3.4",
-         "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.4.tgz",
-         "integrity": "sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==",
+         "version": "16.18.96",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.96.tgz",
+         "integrity": "sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==",
         "dev": true
      },
      "acorn": {
-         "version": "8.8.2",
-         "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-         "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+         "version": "8.11.3",
+         "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
+         "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
         "dev": true
      },
      "acorn-walk": {
-         "version": "8.2.0",
-         "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-         "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+         "version": "8.3.2",
+         "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
+         "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
         "dev": true
      },
      "arg": {
@@ -1336,12 +1414,15 @@
         }
      },
      "call-bind": {
-         "version": "1.0.2",
-         "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-         "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+         "version": "1.0.7",
+         "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+         "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
         "requires": {
-            "function-bind": "^1.1.1",
-            "get-intrinsic": "^1.0.2"
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "set-function-length": "^1.2.1"
         }
      },
      "camelcase": {
@@ -1427,6 +1508,16 @@
         "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
         "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ=="
      },
+      "define-data-property": {
+         "version": "1.1.4",
+         "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+         "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+         "requires": {
+            "es-define-property": "^1.0.0",
+            "es-errors": "^1.3.0",
+            "gopd": "^1.0.1"
+         }
+      },
      "diff": {
         "version": "4.0.2",
         "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
@@ -1441,6 +1532,19 @@
            "is-arrayish": "^0.2.1"
         }
      },
+      "es-define-property": {
+         "version": "1.0.0",
+         "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+         "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+         "requires": {
+            "get-intrinsic": "^1.2.4"
+         }
+      },
+      "es-errors": {
+         "version": "1.3.0",
+         "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+         "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="
+      },
      "filter-obj": {
         "version": "1.1.0",
         "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
@@ -1455,9 +1559,9 @@
         }
      },
      "function-bind": {
-         "version": "1.1.1",
-         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-         "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+         "version": "1.1.2",
+         "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+         "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
      },
      "generate-function": {
         "version": "2.3.1",
@@ -1468,13 +1572,23 @@
         }
      },
      "get-intrinsic": {
-         "version": "1.2.0",
-         "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-         "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+         "version": "1.2.4",
+         "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+         "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
         "requires": {
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.3"
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "has-proto": "^1.0.1",
+            "has-symbols": "^1.0.3",
+            "hasown": "^2.0.0"
+         }
+      },
+      "gopd": {
+         "version": "1.0.1",
+         "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+         "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+         "requires": {
+            "get-intrinsic": "^1.1.3"
         }
      },
      "graceful-fs": {
@@ -1482,19 +1596,32 @@
         "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
         "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
      },
-      "has": {
-         "version": "1.0.3",
-         "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-         "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "has-property-descriptors": {
+         "version": "1.0.2",
+         "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+         "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
         "requires": {
-            "function-bind": "^1.1.1"
+            "es-define-property": "^1.0.0"
         }
      },
+      "has-proto": {
+         "version": "1.0.3",
+         "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+         "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q=="
+      },
      "has-symbols": {
         "version": "1.0.3",
         "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
         "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
      },
+      "hasown": {
+         "version": "2.0.2",
+         "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+         "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+         "requires": {
+            "function-bind": "^1.1.2"
+         }
+      },
      "hosted-git-info": {
         "version": "2.8.9",
         "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
@@ -1506,9 +1633,9 @@
         "integrity": "sha512-BYqTHXTGUIvg7t1r4sJNKcbDZkL92nkXA8YtRpbjFHRHGDL/NtUeiBJMeE60kIFN/Mg8ESaWQvftaYMGJzQZCQ=="
      },
      "ip": {
-         "version": "1.1.8",
-         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
-         "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="
+         "version": "1.1.9",
+         "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
+         "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
      },
      "ip2buf": {
         "version": "2.0.0",
@@ -1521,11 +1648,11 @@
         "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
      },
      "is-core-module": {
-         "version": "2.11.0",
-         "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
-         "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+         "version": "2.13.1",
+         "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
+         "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
         "requires": {
-            "has": "^1.0.3"
+            "hasown": "^2.0.0"
         }
      },
      "is-plain-obj": {
@@ -1669,9 +1796,9 @@
         "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="
      },
      "object-inspect": {
-         "version": "1.12.3",
-         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-         "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="
+         "version": "1.13.1",
+         "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
+         "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ=="
      },
      "p-limit": {
         "version": "1.3.0",
@@ -1760,11 +1887,11 @@
         "integrity": "sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="
      },
      "qs": {
-         "version": "6.11.1",
-         "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz",
-         "integrity": "sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==",
+         "version": "6.12.1",
+         "resolved": "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz",
+         "integrity": "sha512-zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==",
         "requires": {
-            "side-channel": "^1.0.4"
+            "side-channel": "^1.0.6"
         }
      },
      "query-string": {
@@ -1812,11 +1939,11 @@
         }
      },
      "resolve": {
-         "version": "1.22.1",
-         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
-         "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+         "version": "1.22.8",
+         "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+         "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
         "requires": {
-            "is-core-module": "^2.9.0",
+            "is-core-module": "^2.13.0",
            "path-parse": "^1.0.7",
            "supports-preserve-symlinks-flag": "^1.0.0"
         }
@@ -1836,6 +1963,19 @@
         "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
         "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
      },
+      "set-function-length": {
+         "version": "1.2.2",
+         "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+         "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+         "requires": {
+            "define-data-property": "^1.1.4",
+            "es-errors": "^1.3.0",
+            "function-bind": "^1.1.2",
+            "get-intrinsic": "^1.2.4",
+            "gopd": "^1.0.1",
+            "has-property-descriptors": "^1.0.2"
+         }
+      },
      "shebang-command": {
         "version": "2.0.0",
         "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -1852,13 +1992,14 @@
         "dev": true
      },
      "side-channel": {
-         "version": "1.0.4",
-         "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-         "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+         "version": "1.0.6",
+         "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+         "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
         "requires": {
-            "call-bind": "^1.0.0",
-            "get-intrinsic": "^1.0.2",
-            "object-inspect": "^1.9.0"
+            "call-bind": "^1.0.7",
+            "es-errors": "^1.3.0",
+            "get-intrinsic": "^1.2.4",
+            "object-inspect": "^1.13.1"
         }
      },
      "signal-exit": {
@@ -1876,9 +2017,9 @@
         }
      },
      "spdx-exceptions": {
-         "version": "2.3.0",
-         "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-         "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+         "version": "2.5.0",
+         "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+         "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="
      },
      "spdx-expression-parse": {
         "version": "3.0.1",
@@ -1890,9 +2031,9 @@
         }
      },
      "spdx-license-ids": {
-         "version": "3.0.13",
-         "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
-         "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w=="
+         "version": "3.0.17",
+         "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
+         "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="
      },
      "split-on-first": {
         "version": "1.1.0",
@@ -1942,9 +2083,9 @@
         "integrity": "sha512-MTBWv3jhVjTU7XR3IQHllbiJs8sc75a80OEhB6or/q7pLTWgQ0bMGQXXYQSrSuXe6WiKWDZ5txXY5P59a/coVA=="
      },
      "ts-node": {
-         "version": "10.9.1",
-         "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-         "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+         "version": "10.9.2",
+         "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+         "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
         "dev": true,
         "requires": {
            "@cspotcode/source-map-support": "^0.8.0",
@@ -1968,9 +2109,9 @@
         "integrity": "sha512-8yyRd1ZdNp+AQLGqi3lTaA2k81JjlIZOyFQEsi7GQWBgirnQOxjqVtDEbYHM2Z4yFdJ5AQw0fxBLLnDCl6RXoQ=="
      },
      "typescript": {
-         "version": "5.0.2",
-         "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.2.tgz",
-         "integrity": "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==",
+         "version": "5.4.5",
+         "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+         "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
         "dev": true,
         "peer": true
      },
@@ -1979,11 +2120,6 @@
         "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
         "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
      },
-      "uuid": {
-         "version": "8.3.2",
-         "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-         "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-      },
      "v8-compile-cache-lib": {
         "version": "3.0.1",
         "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
--- a/plugins/bticino/package.json
+++ b/plugins/bticino/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/bticino",
-   "version": "0.0.15",
+   "version": "0.0.16",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
      "prescrypted-setup-project": "scrypted-package-json",
@@ -34,14 +34,12 @@
   "dependencies": {
      "@slyoldfox/sip": "^0.0.6-1",
      "sdp": "^3.0.3",
-      "stun": "^2.1.0",
-      "uuid": "^8.3.2"
+      "stun": "^2.1.0"
   },
   "devDependencies": {
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
      "@types/node": "^16.9.6",
-      "@types/uuid": "^8.3.4",
      "cross-env": "^7.0.3",
      "ts-node": "^10.9.1"
   }
--- a/plugins/bticino/src/bticino-camera.ts
+++ b/plugins/bticino/src/bticino-camera.ts
@@ -1,22 +1,22 @@
-import { closeQuiet, createBindUdp, createBindZero, listenZeroSingleClient } from '@scrypted/common/src/listen-cluster';
+import { createBindUdp, listenZeroSingleClient } from '@scrypted/common/src/listen-cluster';
 import { sleep } from '@scrypted/common/src/sleep';
 import { RtspServer } from '@scrypted/common/src/rtsp-server';
 import { addTrackControls, parseSdp } from '@scrypted/common/src/sdp-utils';
-import sdk, { BinarySensor, Camera, DeviceProvider, FFmpegInput, HttpRequest, HttpRequestHandler, HttpResponse, Intercom, MediaObject, MediaStreamUrl, MotionSensor, PictureOptions, Reboot, ResponseMediaStreamOptions, ScryptedDeviceBase, ScryptedMimeTypes, Setting, Settings, SettingValue, VideoCamera, VideoClip, VideoClipOptions, VideoClips } from '@scrypted/sdk';
+import sdk, { BinarySensor, Camera, DeviceProvider, FFmpegInput, HttpRequest, HttpRequestHandler, HttpResponse, Intercom, MediaObject, MediaStreamUrl, MotionSensor, PictureOptions, Reboot, ResponseMediaStreamOptions, ScryptedDeviceBase, ScryptedInterface, ScryptedMimeTypes, Setting, Settings, SettingValue, VideoCamera, VideoClip, VideoClipOptions, VideoClips } from '@scrypted/sdk';
 import { SipCallSession } from '../../sip/src/sip-call-session';
 import { RtpDescription, getPayloadType, getSequenceNumber, isRtpMessagePayloadType, isStunMessage } from '../../sip/src/rtp-utils';
 import { VoicemailHandler } from './bticino-voicemailHandler';
 import { CompositeSipMessageHandler } from '../../sip/src/compositeSipMessageHandler';
 import { SipHelper } from './sip-helper';
 import child_process, { ChildProcess } from 'child_process';
-import dgram from 'dgram';
 import { BticinoStorageSettings } from './storage-settings';
 import { BticinoSipPlugin } from './main';
 import { BticinoSipLock } from './bticino-lock';
-import { ffmpegLogInitialOutput, safeKillFFmpeg, safePrintFFmpegArguments } from '@scrypted/common/src/media-helpers';
+import { safePrintFFmpegArguments } from '@scrypted/common/src/media-helpers';
 import { PersistentSipManager } from './persistent-sip-manager';
 import { InviteHandler } from './bticino-inviteHandler';
 import { SipOptions, SipRequest } from '../../sip/src/sip-manager';
+import { startRtpForwarderProcess } from '../../webrtc/src/rtp-forwarders';
 import fs from "fs"
 import url from "url"
 import path from 'path';
@@ -37,8 +37,7 @@ export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor

    private session: SipCallSession
    private remoteRtpDescription: Promise<RtpDescription>
-    private audioOutForwarder: dgram.Socket
-    private audioOutProcess: ChildProcess
+    private forwarder
    private refreshTimeout: NodeJS.Timeout
    public requestHandlers: CompositeSipMessageHandler = new CompositeSipMessageHandler()
    public incomingCallRequest : SipRequest
@@ -276,21 +275,27 @@ export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor
    }    

    async takePicture(option?: PictureOptions): Promise<MediaObject> {
-        const thumbnailCacheTime : number = parseInt( this.storage?.getItem('thumbnailCacheTime') ) * 1000 || 300000 
-        const now = new Date().getTime()
-        if( !this.lastImageRefresh || this.lastImageRefresh + thumbnailCacheTime < now ) {
-            // get a proxy object to make sure we pass prebuffer when already watching a stream
-            let cam : VideoCamera = sdk.systemManager.getDeviceById<VideoCamera>(this.id)
-            let vs : MediaObject = await cam.getVideoStream()
-            let buf : Buffer = await mediaManager.convertMediaObjectToBuffer(vs, 'image/jpeg');
-            this.cachedImage = buf
-            this.lastImageRefresh = new Date().getTime()
-            this.console.log(`Camera picture updated and cached: ${this.lastImageRefresh} + cache time: ${thumbnailCacheTime} < ${now}`)
-
+        let rebroadcastEnabled = this.interfaces?.includes( "mixin:@scrypted/prebuffer-mixin")
+        if( rebroadcastEnabled ) {
+            const thumbnailCacheTime : number = parseInt( this.storage?.getItem('thumbnailCacheTime') ) * 1000 || 300000 
+            const now = new Date().getTime()
+            if( !this.lastImageRefresh || this.lastImageRefresh + thumbnailCacheTime < now ) {
+                // get a proxy object to make sure we pass prebuffer when already watching a stream
+                let cam : VideoCamera = sdk.systemManager.getDeviceById<VideoCamera>(this.id)
+                let vs : MediaObject = await cam.getVideoStream()
+                let buf : Buffer = await mediaManager.convertMediaObjectToBuffer(vs, 'image/jpeg');
+                this.cachedImage = buf
+                this.lastImageRefresh = new Date().getTime()
+                this.console.log(`Camera picture updated and cached: ${this.lastImageRefresh} + cache time: ${thumbnailCacheTime} < ${now}`)
+    
+            } else {
+                this.console.log(`Not refreshing camera picture: ${this.lastImageRefresh} + cache time: ${thumbnailCacheTime} < ${now}`)
+            }
+            
+            return mediaManager.createMediaObject(this.cachedImage, 'image/jpeg')
        } else {
-            this.console.log(`Not refreshing camera picture: ${this.lastImageRefresh} + cache time: ${thumbnailCacheTime} < ${now}`)
+            throw new Error("To enable snapshots, enable rebroadcast plugin or set a Snapshot URL in the Snapshot plugin to an external image.");
        }
-        return mediaManager.createMediaObject(this.cachedImage, 'image/jpeg')
    }

    async getPictureOptions(): Promise<PictureOptions[]> {
@@ -317,52 +322,31 @@ export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor
            this.session = await this.callIntercom( cleanup )
        }
            
-
        this.stopIntercom();

-        const ffmpegInput: FFmpegInput = JSON.parse((await mediaManager.convertMediaObjectToBuffer(media, ScryptedMimeTypes.FFmpegInput)).toString());
-
-        const audioOutForwarder = await createBindZero()
-        this.audioOutForwarder = audioOutForwarder.server
+        const ffmpegInput = await sdk.mediaManager.convertMediaObjectToJSON<FFmpegInput>(media, ScryptedMimeTypes.FFmpegInput);
        let address = (await this.remoteRtpDescription).address
-        audioOutForwarder.server.on('message', message => {
-            if( this.session )
-                this.session.audioSplitter.send(message, 40004, address)
-            return null
-        });
-
-        const args = ffmpegInput.inputArguments.slice();
-        args.push(
-            '-vn', '-dn', '-sn',
-            '-acodec', 'speex',
-            '-flags', '+global_header',
-            '-ac', '1',
-            '-ar', '8k',
-            '-f', 'rtp',
-            //'-srtp_out_suite', 'AES_CM_128_HMAC_SHA1_80',
-            //'-srtp_out_params', encodeSrtpOptions(this.decodedSrtpOptions),
-            `rtp://127.0.0.1:${audioOutForwarder.port}?pkt_size=188`,
-        );
-
-        this.console.log("===========================================")
-        safePrintFFmpegArguments( this.console, args )
-        this.console.log("===========================================")
-
-        const cp = child_process.spawn(await mediaManager.getFFmpegPath(), args);
-        ffmpegLogInitialOutput(this.console, cp)
-        this.audioOutProcess = cp;
-        cp.on('exit', () => this.console.log('two way audio ended'));
-        this.session.onCallEnded.subscribe(() => {
-            closeQuiet(audioOutForwarder.server);
-            safeKillFFmpeg(cp)
+        this.forwarder = await startRtpForwarderProcess(this.console, ffmpegInput, {
+            audio: {
+                codecCopy: 'speex',
+                encoderArguments: [
+                    '-vn', '-sn', '-dn',
+                    '-acodec', 'speex',
+                    '-flags', '+global_header',
+                    '-ac', '1',
+                    '-ar', '8k',
+                    '-f', 'rtp',
+                ],
+                onRtp: rtp => {
+                        this.session?.audioSplitter?.send(rtp, 40004, address)
+                }
+            }
        });
    }

    async stopIntercom(): Promise<void> {
-        closeQuiet(this.audioOutForwarder)
-        this.audioOutProcess?.kill('SIGKILL')
-        this.audioOutProcess = undefined
-        this.audioOutForwarder = undefined
+        this.forwarder?.kill()
+        this.forwarder = undefined
    }

    resetStreamTimeout() {
@@ -572,12 +556,24 @@ export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor
        // Call the C300X
        this.remoteRtpDescription = sip.callOrAcceptInvite(
            ( audio ) => {
-            return [
-                // this SDP is used by the intercom and will send the encrypted packets which we don't care about to the loopback on port 65000 of the intercom
-                `m=audio 65000 RTP/SAVP 110`,
-                `a=rtpmap:110 speex/8000`,
-                `a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${this.keyAndSalt}`,
-            ]
+                let audioSection = [
+                    // this SDP is used by the intercom and will send the encrypted packets which we don't care about to the loopback on port 65000 of the intercom
+                    `m=audio 65000 RTP/SAVP 110`,
+                    `a=rtpmap:110 speex/8000`,
+                    `a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:${this.keyAndSalt}`,
+                ]
+                if( !this.incomingCallRequest ) {
+                    let DEVADDR = this.storage.getItem('DEVADDR');
+                    if( DEVADDR ) {
+                        audioSection.unshift('a=DEVADDR:' + DEVADDR)
+                    } else {
+                        if( sipOptions.to.toLocaleLowerCase().indexOf('c300x') >= 0 || sipOptions.to.toLocaleLowerCase().indexOf('c100x') >= 0 ) {
+                            // Needed for bt_answering_machine (bticino specific), to check for c100X
+                            audioSection.unshift('a=DEVADDR:20')
+                        }                           
+                    }
+                }
+                return audioSection
        }, ( video ) => {
                return [
                // this SDP is used by the intercom and will send the encrypted packets which we don't care about to the loopback on port 65000 of the intercom
--- a/plugins/cloud/package-lock.json
+++ b/plugins/cloud/package-lock.json
--- a/plugins/cloud/package.json
+++ b/plugins/cloud/package.json
@@ -42,7 +42,7 @@
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
      "bpmux": "^8.2.1",
-      "cloudflared": "^0.4.0",
+      "cloudflared": "^0.5.2",
      "exponential-backoff": "^3.1.1",
      "http-proxy": "^1.18.1",
      "nat-upnp": "file:./external/node-nat-upnp"
@@ -51,7 +51,7 @@
      "@types/http-proxy": "^1.17.14",
      "@types/ip": "^1.1.3",
      "@types/nat-upnp": "^1.1.5",
-      "@types/node": "^20.11.19"
+      "@types/node": "^20.14.6"
   },
-   "version": "0.2.13"
+   "version": "0.2.15"
 }
--- a/plugins/cloud/src/main.ts
+++ b/plugins/cloud/src/main.ts
@@ -531,8 +531,9 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
            throw new Error('@scrypted/cloud is not logged in.');
        const q = qsstringify({
            scope: local.pathname,
+            serverId: this.storageSettings.values.serverId,
            ttl,
-        })
+        });
        const scope = await httpFetch({
            url: `https://${this.getHostname()}/_punch/scope?${q}`,
            headers: {
@@ -951,13 +952,13 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
    }

    async startCloudflared() {
-        if (!this.storageSettings.values.cloudflareEnabled) {
-            this.console.log('cloudflared is disabled.');
-            return;
-        }
-
        while (true) {
            try {
+                if (!this.storageSettings.values.cloudflareEnabled) {
+                    this.console.log('cloudflared is disabled.');
+                    return;
+                }
+
                this.console.log('starting cloudflared');
                this.cloudflared = await backOff(async () => {
                    const pluginVolume = process.env.SCRYPTED_PLUGIN_VOLUME;
@@ -1057,12 +1058,13 @@ class ScryptedCloud extends ScryptedDeviceBase implements OauthClient, Settings,
                    maxDelay: 300000,
                });

-                await once(this.cloudflared.child, 'exit');
-                throw new Error('cloudflared exited.');
+                await once(this.cloudflared.child, 'exit').catch(() => { });
+                // the successfully started cloudflared process may exit at some point, loop and allow it to restart.
+                this.console.error('cloudflared exited');
            }
            catch (e) {
+                // this error may be reached if the cloudflared backoff fails.
                this.console.error('cloudflared error', e);
-                throw e;
            }
            finally {
                this.cloudflared = undefined;
--- a/plugins/core/fs/lxc/scrypted.service
+++ b/plugins/core/fs/lxc/scrypted.service
@@ -15,6 +15,8 @@ Environment="SCRYPTED_PYTHON39_PATH=/usr/bin/python3.9"
 Environment="SCRYPTED_PYTHON310_PATH=/usr/bin/python3.10"
 Environment="SCRYPTED_FFMPEG_PATH=/usr/bin/ffmpeg"
 Environment="SCRYPTED_INSTALL_ENVIRONMENT=lxc"
+StandardOutput=null
+StandardError=null

 [Install]
 WantedBy=multi-user.target
--- a/plugins/core/package-lock.json
+++ b/plugins/core/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/core",
-   "version": "0.3.23",
+   "version": "0.3.28",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/core",
-         "version": "0.3.23",
+         "version": "0.3.28",
         "license": "Apache-2.0",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/core/package.json
+++ b/plugins/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/core",
-   "version": "0.3.23",
+   "version": "0.3.28",
   "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
   "author": "Scrypted",
   "license": "Apache-2.0",
--- a/plugins/core/src/platform/lxc.ts
+++ b/plugins/core/src/platform/lxc.ts
@@ -2,6 +2,7 @@ import fs from 'fs';
 import child_process from 'child_process';
 import { once } from 'events';
 import sdk from '@scrypted/sdk';
+import { stdout } from 'process';

 export const SCRYPTED_INSTALL_ENVIRONMENT_LXC = 'lxc';

@@ -41,6 +42,37 @@ export async function checkLxcDependencies() {
            sdk.log.a('Failed to daemon-reload systemd.');
    }

+    try {
+        // intel opencl icd is broken from their official apt repos on kernel versions 6.8, which ships with ubuntu 24.04 and proxmox 8.2.
+        // the intel apt repo has not been updated yet.
+        // the current workaround is to install the release manually.
+        // https://github.com/intel/compute-runtime/releases/tag/24.13.29138.7
+        const output = await new Promise<string>((r,f)=> child_process.exec("sh -c 'apt show versions intel-opencl-icd'", (err, stdout, stderr) => {
+            if (err)
+                f(err);
+            else
+                r(stdout + '\n' + stderr);
+        }));
+
+        if (
+            // apt
+            output.includes('Version: 23')
+            // was installed via script at some point
+            || output.includes('Version: 24.13.29138.7')
+            // current script version: 24.17.29377.6
+            ) {
+            const cp = child_process.spawn('sh', ['-c', 'curl https://raw.githubusercontent.com/koush/scrypted/main/install/docker/install-intel-graphics.sh | bash']);
+            const [exitCode] = await once(cp, 'exit');
+            if (exitCode !== 0)
+                sdk.log.a('Failed to install intel-opencl-icd.');
+            else
+                needRestart = true;
+        }
+    }
+    catch (e) {
+        sdk.log.a('Failed to verify/install intel-opencl-icd version.');
+    }
+
    if (needRestart)
        sdk.log.a('A system update is pending. Please restart Scrypted to apply changes.');
 }
--- a/plugins/core/ui/src/client.ts
+++ b/plugins/core/ui/src/client.ts
@@ -26,6 +26,7 @@ export function loginScrypted(username: string, password: string, change_passwor
        username,
        password,
        change_password,
+        maxAge: 7 * 24 * 60 * 60 * 1000,
    });
 }

--- a/plugins/core/ui/src/interfaces/CameraViewer.vue
+++ b/plugins/core/ui/src/interfaces/CameraViewer.vue
@@ -161,10 +161,10 @@ export default {
        let t = ``;
        let toffset = 0;
        if (detection.score && detection.className !== 'motion') {
-          t += `<tspan x='${x}' dy='${toffset}em'>${Math.round(detection.score * 100) / 100}</tspan>`
+          t += `<tspan x='${x}' dy='${toffset}em'>${Math.round((detection.labelScore || detection.score) * 100) / 100}</tspan>`
          toffset -= 1.2;
        }
-        const tname = detection.className + (detection.id ? `: ${detection.id}` : '')
+        const tname = (detection.label || detection.className) + (detection.id ? `: ${detection.id}` : '')
        t += `<tspan x='${x}' dy='${toffset}em'>${tname}</tspan>`

        const fs = 20;
--- a/plugins/coreml/package-lock.json
+++ b/plugins/coreml/package-lock.json
@@ -1,25 +1,25 @@
 {
   "name": "@scrypted/coreml",
-   "version": "0.1.45",
+   "version": "0.1.65",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/coreml",
-         "version": "0.1.45",
+         "version": "0.1.65",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.101",
+         "version": "0.3.31",
         "dev": true,
         "license": "ISC",
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -65,7 +65,7 @@
            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
--- a/plugins/coreml/package.json
+++ b/plugins/coreml/package.json
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.45"
+   "version": "0.1.65"
 }
--- a/plugins/coreml/src/coreml/init.py
+++ b/plugins/coreml/src/coreml/init.py
@@ -13,7 +13,12 @@ from PIL import Image
 from scrypted_sdk import Setting, SettingValue

 from common import yolo
-from coreml.recognition import CoreMLRecognition
+from coreml.face_recognition import CoreMLFaceRecognition
+
+try:
+    from coreml.text_recognition import CoreMLTextRecognition
+except:
+    CoreMLTextRecognition = None
 from predict import Prediction, PredictPlugin
 from predict.rectangle import Rectangle

@@ -21,14 +26,16 @@ predictExecutor = concurrent.futures.ThreadPoolExecutor(1, "CoreML-Predict")

 availableModels = [
    "Default",
+    "scrypted_yolov10m_320",
+    "scrypted_yolov10n_320",
+    "scrypted_yolo_nas_s_320",
+    "scrypted_yolov9e_320",
    "scrypted_yolov9c_320",
-    "scrypted_yolov9c",
+    "scrypted_yolov9s_320",
+    "scrypted_yolov9t_320",
    "scrypted_yolov6n_320",
-    "scrypted_yolov6n",
    "scrypted_yolov6s_320",
-    "scrypted_yolov6s",
    "scrypted_yolov8n_320",
-    "scrypted_yolov8n",
    "ssdlite_mobilenet_v2",
    "yolov4-tiny",
 ]
@@ -72,9 +79,11 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv
                self.storage.setItem("model", "Default")
            model = "scrypted_yolov9c_320"
        self.yolo = "yolo" in model
+        self.scrypted_yolov10n = "scrypted_yolov10" in model
+        self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
        self.scrypted_yolo = "scrypted_yolo" in model
        self.scrypted_model = "scrypted" in model
-        model_version = "v7"
+        model_version = "v8"
        mlmodel = "model" if self.scrypted_yolo else model

        print(f"model: {model}")
@@ -127,29 +136,51 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv
        self.loop = asyncio.get_event_loop()
        self.minThreshold = 0.2

+        self.faceDevice = None
+        self.textDevice = None
        asyncio.ensure_future(self.prepareRecognitionModels(), loop=self.loop)

    async def prepareRecognitionModels(self):
        try:
+            devices = [
+                {
+                    "nativeId": "facerecognition",
+                    "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
+                    "interfaces": [
+                        scrypted_sdk.ScryptedInterface.ObjectDetection.value,
+                    ],
+                    "name": "CoreML Face Recognition",
+                },
+            ]
+
+            if CoreMLTextRecognition:
+                devices.append(
+                    {
+                        "nativeId": "textrecognition",
+                        "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
+                        "interfaces": [
+                            scrypted_sdk.ScryptedInterface.ObjectDetection.value,
+                        ],
+                        "name": "CoreML Text Recognition",
+                    },
+                )
+
            await scrypted_sdk.deviceManager.onDevicesChanged(
                {
-                    "devices": [
-                        {
-                            "nativeId": "recognition",
-                            "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
-                            "interfaces": [
-                                scrypted_sdk.ScryptedInterface.ObjectDetection.value,
-                            ],
-                            "name": "CoreML Recognition",
-                        }
-                    ]
+                    "devices": devices,
                }
            )
        except:
            pass

    async def getDevice(self, nativeId: str) -> Any:
-        return CoreMLRecognition(nativeId)
+        if nativeId == "facerecognition":
+            self.faceDevice = self.faceDevice or CoreMLFaceRecognition(nativeId)
+            return self.faceDevice
+        if nativeId == "textrecognition":
+            self.textDevice = self.textDevice or CoreMLTextRecognition(nativeId)
+            return self.textDevice
+        raise Exception("unknown device")

    async def getSettings(self) -> list[Setting]:
        model = self.storage.getItem("model") or "Default"
@@ -174,7 +205,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv

    def get_input_size(self) -> Tuple[float, float]:
        return (self.inputwidth, self.inputheight)
-    
+
    async def detect_batch(self, inputs: List[Any]) -> List[Any]:
        out_dicts = await asyncio.get_event_loop().run_in_executor(
            predictExecutor, lambda: self.model.predict(inputs)
@@ -188,6 +219,18 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.Settings, scrypted_sdk.DeviceProv
        if self.yolo:
            out_dict = await self.queue_batch({self.input_name: input})

+            if self.scrypted_yolov10n:
+                results = list(out_dict.values())[0][0]
+                objs = yolo.parse_yolov10(results)
+                ret = self.create_detection_result(objs, src_size, cvss)
+                return ret
+
+            if self.scrypted_yolo_nas:
+                predictions  = list(out_dict.values())
+                objs = yolo.parse_yolo_nas(predictions)
+                ret = self.create_detection_result(objs, src_size, cvss)
+                return ret
+
            if self.scrypted_yolo:
                results = list(out_dict.values())[0][0]
                objs = yolo.parse_yolov9(results)
--- a/plugins/coreml/src/coreml/face_recognition.py
+++ b/plugins/coreml/src/coreml/face_recognition.py
@@ -3,13 +3,15 @@ from __future__ import annotations
 import concurrent.futures
 import os

+import asyncio
 import coremltools as ct
 import numpy as np
 # import Quartz
 # from Foundation import NSData, NSMakeSize

 # import Vision
-from predict.recognize import RecognizeDetection
+from predict.face_recognize import FaceRecognizeDetection
+from PIL import Image


 def euclidean_distance(arr1, arr2):
@@ -26,9 +28,11 @@ def cosine_similarity(vector_a, vector_b):

 predictExecutor = concurrent.futures.ThreadPoolExecutor(8, "Vision-Predict")

-class CoreMLRecognition(RecognizeDetection):
+class CoreMLFaceRecognition(FaceRecognizeDetection):
    def __init__(self, nativeId: str | None = None):
        super().__init__(nativeId=nativeId)
+        self.detectExecutor = concurrent.futures.ThreadPoolExecutor(1, "detect-face")
+        self.recogExecutor = concurrent.futures.ThreadPoolExecutor(1, "recog-face")

    def downloadModel(self, model: str):
        model_version = "v7"
@@ -51,23 +55,29 @@ class CoreMLRecognition(RecognizeDetection):
        inputName = model.get_spec().description.input[0].name
        return model, inputName
    
-    def predictDetectModel(self, input):
-        model, inputName = self.detectModel
-        out_dict = model.predict({inputName: input})
-        results = list(out_dict.values())[0][0]
+    async def predictDetectModel(self, input: Image.Image):
+        def predict():
+            model, inputName = self.detectModel
+            out_dict = model.predict({inputName: input})
+            results = list(out_dict.values())[0][0]
+            return results
+
+        results = await asyncio.get_event_loop().run_in_executor(
+            self.detectExecutor, lambda: predict()
+        )
        return results

-    def predictFaceModel(self, input):
-        model, inputName = self.faceModel
-        out_dict = model.predict({inputName: input})
-        return out_dict["var_2167"][0]
+    async def predictFaceModel(self, input: np.ndarray):
+        def predict():
+            model, inputName = self.faceModel
+            out_dict = model.predict({inputName: input})
+            results = list(out_dict.values())[0][0]
+            return results
+        results = await asyncio.get_event_loop().run_in_executor(
+            self.recogExecutor, lambda: predict()
+        )
+        return results
    
-    def predictTextModel(self, input):
-        model, inputName = self.textModel
-        out_dict = model.predict({inputName: input})
-        preds = out_dict["linear_2"]
-        return preds
-
    # def predictVision(self, input: Image.Image) -> asyncio.Future[list[Prediction]]:
    #     buffer = input.tobytes()
    #     myData = NSData.alloc().initWithBytes_length_(buffer, len(buffer))
--- a/plugins/coreml/src/coreml/text_recognition.py
+++ b/plugins/coreml/src/coreml/text_recognition.py
@@ -0,0 +1,63 @@
+from __future__ import annotations
+
+import concurrent.futures
+import os
+
+import asyncio
+
+import coremltools as ct
+import numpy as np
+from PIL import Image
+
+from predict.text_recognize import TextRecognition
+
+
+class CoreMLTextRecognition(TextRecognition):
+    def __init__(self, nativeId: str | None = None):
+        super().__init__(nativeId=nativeId)
+
+        self.detectExecutor = concurrent.futures.ThreadPoolExecutor(1, "detect-text")
+        self.recogExecutor = concurrent.futures.ThreadPoolExecutor(1, "recog-text")
+
+    def downloadModel(self, model: str):
+        model_version = "v8"
+        mlmodel = "model"
+
+        files = [
+            f"{model}/{model}.mlpackage/Data/com.apple.CoreML/weights/weight.bin",
+            f"{model}/{model}.mlpackage/Data/com.apple.CoreML/{mlmodel}.mlmodel",
+            f"{model}/{model}.mlpackage/Manifest.json",
+        ]
+
+        for f in files:
+            p = self.downloadFile(
+                f"https://github.com/koush/coreml-models/raw/main/{f}",
+                f"{model_version}/{f}",
+            )
+            modelFile = os.path.dirname(p)
+
+        model = ct.models.MLModel(modelFile)
+        inputName = model.get_spec().description.input[0].name
+        return model, inputName
+
+    async def predictDetectModel(self, input: Image.Image):
+        def predict():
+            model, inputName = self.detectModel
+            out_dict = model.predict({inputName: input})
+            results = list(out_dict.values())[0]
+            return results
+        results = await asyncio.get_event_loop().run_in_executor(
+            self.detectExecutor, lambda: predict()
+        )
+        return results
+
+    async def predictTextModel(self, input: np.ndarray):
+        def predict():
+            model, inputName = self.textModel
+            out_dict = model.predict({inputName: input})
+            preds = out_dict["linear_2"]
+            return preds
+        preds = await asyncio.get_event_loop().run_in_executor(
+            self.recogExecutor, lambda: predict()
+        )
+        return preds
--- a/plugins/coreml/src/detect
+++ b/plugins/coreml/src/detect
@@ -1 +1 @@
-../../tensorflow-lite/src/detect
+../../openvino/src/detect/
--- a/plugins/coreml/src/predict
+++ b/plugins/coreml/src/predict
@@ -1 +1 @@
-../../tensorflow-lite/src/predict
+../../openvino/src/predict
--- a/plugins/coreml/src/requirements.optional.txt
+++ b/plugins/coreml/src/requirements.optional.txt
@@ -0,0 +1 @@
+opencv-python==4.10.0.82
--- a/plugins/coreml/src/requirements.txt
+++ b/plugins/coreml/src/requirements.txt
@@ -1,2 +1,4 @@
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
 coremltools==7.1
-Pillow>=5.4.1
+Pillow==10.3.0
--- a/plugins/dlib/.vscode/settings.json
+++ b/plugins/dlib/.vscode/settings.json
@@ -1,19 +0,0 @@
-
-{
-    // docker installation
-    // "scrypted.debugHost": "koushik-thin",
-    // "scrypted.serverRoot": "/server",
-
-    // pi local installation
-    // "scrypted.debugHost": "192.168.2.119",
-    // "scrypted.serverRoot": "/home/pi/.scrypted",
-
-    // local checkout
-    "scrypted.debugHost": "127.0.0.1",
-    "scrypted.serverRoot": "/Users/koush/.scrypted",
-
-    "scrypted.pythonRemoteRoot": "${config:scrypted.serverRoot}/volume/plugin.zip",
-    "python.analysis.extraPaths": [
-        "./node_modules/@scrypted/sdk/types/scrypted_python"
-    ]
-}
--- a/plugins/dlib/README.md
+++ b/plugins/dlib/README.md
@@ -1,3 +0,0 @@
-# Dlib Face Recognition for Scrypted
-
-This plugin adds face recognition capabilities to any camera in Scrypted.
--- a/plugins/dlib/fs/black.jpg
+++ b/plugins/dlib/fs/black.jpg
--- a/plugins/dlib/src/detect
+++ b/plugins/dlib/src/detect
@@ -1 +0,0 @@
-../../tensorflow-lite/src/detect
--- a/plugins/dlib/src/dlibplugin/init.py
+++ b/plugins/dlib/src/dlibplugin/init.py
@@ -1,252 +0,0 @@
-from __future__ import annotations
-import re
-import scrypted_sdk
-from typing import Any, Tuple
-from predict import PredictPlugin, Prediction, Rectangle
-import os
-from PIL import Image
-import face_recognition
-import numpy as np
-from typing import Any, List, Tuple, Mapping
-from scrypted_sdk.types import ObjectDetectionModel, ObjectDetectionResult, ObjectsDetected, Setting
-from predict import PredictSession
-import threading
-import asyncio
-import base64
-import json
-import random
-import string
-from scrypted_sdk import RequestPictureOptions, MediaObject, Setting
-import os
-import json
-
-def random_string():
-    letters = string.ascii_lowercase
-    return ''.join(random.choice(letters) for i in range(10))
-
-
-MIME_TYPE = 'x-scrypted-dlib/x-raw-image'
-
-class DlibPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Settings):
-    def __init__(self, nativeId: str | None = None):
-        super().__init__(MIME_TYPE, nativeId=nativeId)
-
-        self.labels = {
-           0: 'face'
-        }
-
-        self.mutex = threading.Lock()
-        self.known_faces = {}
-        self.encoded_faces = {}
-        self.load_known_faces()
-
-    def save_known_faces(self):
-        j = json.dumps(self.known_faces)
-        self.storage.setItem('known', j)
-
-    def load_known_faces(self):
-        self.known_faces = {}
-        self.encoded_faces = {}
-
-        try:
-            self.known_faces = json.loads(self.storage.getItem('known'))
-        except:
-            pass
-
-        for known in self.known_faces:
-            encoded = []
-            self.encoded_faces[known] = encoded
-            encodings = self.known_faces[known]
-            for str in encodings:
-                try:
-                        parsed = base64.decodebytes(bytes(str, 'utf-8'))
-                        encoding = np.frombuffer(parsed, dtype=np.float64)
-                        encoded.append(encoding)
-                except:
-                    pass
-
-    # width, height, channels
-    def get_input_details(self) -> Tuple[int, int, int]:
-        pass
-
-    def get_input_size(self) -> Tuple[float, float]:
-        pass
-
-    def getTriggerClasses(self) -> list[str]:
-        return ['person']
-
-    def detect_once(self, input: Image.Image, settings: Any, src_size, cvss) -> ObjectsDetected:
-        nparray = np.array(input.resize((int(input.width / 4), int(input.height / 4))))
-
-        with self.mutex:
-            face_locations = face_recognition.face_locations(nparray)
-
-        for idx, face in enumerate(face_locations):
-            t, r, b, l = face
-            t *= 4
-            r *= 4
-            b *= 4
-            l *= 4
-            face_locations[idx] = (t, r, b, l)
-
-        nparray = np.array(input)
-
-        with self.mutex:
-            face_encodings = face_recognition.face_encodings(nparray, face_locations)
-
-        all_ids = []
-        all_faces = []
-        for encoded in self.encoded_faces:
-            all_ids += ([encoded] * len(self.encoded_faces[encoded]))
-            all_faces += self.encoded_faces[encoded]
-
-        m = {}
-        for idx, fe in enumerate(face_encodings):
-            results = list(face_recognition.face_distance(all_faces, fe))
-
-            best = 1
-            if len(results):
-                best = min(results)
-                minpos = results.index(best)
-
-            if best > .6:
-                id = random_string() + '.jpg'
-                print('top face %s' % best)
-                print('new face %s' % id)
-                encoded = [fe]
-                self.encoded_faces[id] = encoded
-                all_faces += encoded
-
-                volume = os.environ['SCRYPTED_PLUGIN_VOLUME']
-                people = os.path.join(volume, 'unknown')
-                os.makedirs(people, exist_ok=True)
-                t, r, b, l = face_locations[idx]
-                cropped = input.crop((l, t, r, b))
-                fp = os.path.join(people, id)
-                cropped.save(fp)
-            else:
-                id = all_ids[minpos]
-                print('has face %s' % id)
-                m[idx] = id
-
-        # return
-
-        objs = []
-
-        for face in face_locations:
-            t, r, b, l = face
-            obj = Prediction(0, 1, Rectangle(
-                l,
-                t,
-                r,
-                b
-            ))
-            objs.append(obj)
-
-        ret = self.create_detection_result(objs, src_size, ['face'], cvss)
-
-        for idx, d in enumerate(ret['detections']):
-            d['id'] = m.get(idx)
-            d['name'] = m.get(idx)
-
-        return ret
-
-    def track(self, detection_session: PredictSession, ret: ObjectsDetected):
-        pass
-
-
-    async def takePicture(self, options: RequestPictureOptions = None) -> MediaObject:
-        volume = os.environ['SCRYPTED_PLUGIN_VOLUME']
-        people = os.path.join(volume, 'unknown')
-        os.makedirs(people, exist_ok=True)
-        for unknown in os.listdir(people):
-            fp = os.path.join(people, unknown)
-            ret = scrypted_sdk.mediaManager.createMediaObjectFromUrl('file:/' + fp)
-            return await ret
-
-        black = os.path.join(volume, 'zip', 'unzipped', 'fs', 'black.jpg')
-        ret = scrypted_sdk.mediaManager.createMediaObjectFromUrl('file:/' + black)
-        return await ret
-
-    async def getSettings(self) -> list[Setting]:
-        ret = []
-
-        volume = os.environ['SCRYPTED_PLUGIN_VOLUME']
-        people = os.path.join(volume, 'unknown')
-        os.makedirs(people, exist_ok=True)
-
-        choices = list(self.known_faces.keys())
-
-        for unknown in os.listdir(people):
-            ret.append(
-                {
-                    'key': unknown,
-                    'title': 'Name',
-                    'description': 'Associate this thumbnail with an existing person or identify a new person.',
-                    'choices': choices,
-                    'combobox': True,
-                }
-            )
-            ret.append(
-                {
-                    'key': 'delete',
-                    'title': 'Delete',
-                    'description': 'Delete this face.',
-                    'type': 'button',
-                }
-            )
-            break
-
-        if not len(ret):
-            ret.append(
-                {
-                    'key': 'unknown',
-                    'title': 'Unknown People',
-                    'value': 'Waiting for unknown person...',
-                    'description': 'There are no more people that need to be identified.',
-                    'readonly': True,
-                }
-            )
-
-
-        ret.append(
-            {
-                'key': 'known',
-                'group': 'People',
-                'title': 'Familiar People',
-                'description': 'The people known to this plugin.',
-                'choices': choices,
-                'multiple': True,
-                'value': choices,
-            }
-        )
-
-        return ret
-
-    async def putSetting(self, key: str, value: str) -> None:
-        if key == 'known':
-            n = {}
-            for k in value:
-                n[k] = self.known_faces[k]
-            self.known_faces = n
-            self.save_known_faces()
-        elif value or key == 'delete':
-            volume = os.environ['SCRYPTED_PLUGIN_VOLUME']
-            people = os.path.join(volume, 'unknown')
-            os.makedirs(people, exist_ok=True)
-            for unknown in os.listdir(people):
-                fp = os.path.join(people, unknown)
-                os.remove(fp)
-                if key != 'delete':
-                    encoded = self.encoded_faces[key]
-                    strs = []
-                    for e in encoded:
-                        strs.append(base64.encodebytes(e.tobytes()).decode())
-                    if not self.known_faces.get(value):
-                        self.known_faces[value] = []
-                    self.known_faces[value] += strs
-                    self.save_known_faces()
-                break
-
-        await self.onDeviceEvent(scrypted_sdk.ScryptedInterface.Settings.value, None)
-        await self.onDeviceEvent(scrypted_sdk.ScryptedInterface.Camera.value, None)
--- a/plugins/dlib/src/main.py
+++ b/plugins/dlib/src/main.py
@@ -1,4 +0,0 @@
-from dlibplugin import DlibPlugin
-
-def create_scrypted_plugin():
-    return DlibPlugin()
--- a/plugins/dlib/src/pipeline
+++ b/plugins/dlib/src/pipeline
@@ -1 +0,0 @@
-../../tensorflow-lite/src/pipeline
--- a/plugins/dlib/src/predict
+++ b/plugins/dlib/src/predict
@@ -1 +0,0 @@
-../../tensorflow-lite/src/predict
--- a/plugins/dlib/src/requirements.txt
+++ b/plugins/dlib/src/requirements.txt
@@ -1,10 +0,0 @@
-# plugin
-Pillow>=5.4.1
-PyGObject>=3.30.4; sys_platform != 'win32'
-av>=10.0.0; sys_platform != 'linux' or platform_machine == 'x86_64' or platform_machine == 'aarch64'
-face-recognition
-
-# sort_oh
-scipy
-filterpy
-numpy
--- a/plugins/hikvision/package-lock.json
+++ b/plugins/hikvision/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/hikvision",
-   "version": "0.0.147",
+   "version": "0.0.149",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/hikvision",
-         "version": "0.0.147",
+         "version": "0.0.149",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/hikvision/package.json
+++ b/plugins/hikvision/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/hikvision",
-   "version": "0.0.147",
+   "version": "0.0.149",
   "description": "Hikvision Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/hikvision/src/hikvision-camera-api.ts
+++ b/plugins/hikvision/src/hikvision-camera-api.ts
@@ -189,7 +189,9 @@ export class HikvisionCameraAPI {
                            continue;
                        if (ignore === boundaryEnd)
                            continue;
-                        if (ignore !== boundary) {
+                        if (ignore !== boundary
+                            // older hikvision nvr send a boundary in the headers, but then use a totally different constant boundary value
+                            && ignore != "--boundary") {
                            this.console.error('expected boundary but found', ignore);
                            throw new Error('expected boundary');
                        }
--- a/plugins/hikvision/src/main.ts
+++ b/plugins/hikvision/src/main.ts
@@ -134,7 +134,7 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
            const xml = await xml2js.parseStringPromise(data);


-            const [channelId] = xml.EventNotificationAlert.channelID;
+            const [channelId] = xml.EventNotificationAlert.channelID || xml.EventNotificationAlert.dynChannelID;
            if (!await checkCameraNumber(channelId)) {
                this.console.warn('chann fail')
                return;
--- a/plugins/homekit/README.md
+++ b/plugins/homekit/README.md
@@ -32,10 +32,13 @@ If recordings dont work, it's generally because of a few reasons, **follow the s

 ### HomeKit Discovery and Pairing Issues

-* Ensure all your Home hubs are online and updated. Power cycling them is recommended in case one is stuck.
+* Ensure all your Apple TV and Home Pods are online and updated. Power cycling them is recommended in case one is stuck.
+* Ensure your Apple TV and Home Pods are on the same subnet as the Scrypted server.
 * Ensure LAN/WLAN multicast is enabled on your router.
 * Ensure the iOS device you are using for pairing is on the same network (pairing will fail on cellular).
 * Ensure the Docker installation (if applicable) is using host networking. This configuration is the default if the official Scrypted Docker compose install script was used.
+* Try switching the mDNS advertiser used in the HomeKit plugin settings.
+* Try disabling IGMP Snooping on your router.

 ### HomeKit Live Streaming Timeout (Recordings may be working)

--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.54",
+   "version": "1.2.57",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/homekit",
-         "version": "1.2.54",
+         "version": "1.2.57",
         "dependencies": {
            "@koush/werift-src": "file:../../external/werift",
            "check-disk-space": "^3.4.0",
@@ -47,26 +47,20 @@
            "examples/*"
         ],
         "devDependencies": {
+            "@biomejs/biome": "^1.4.1",
            "@types/jest": "^29.5.11",
-            "@types/node": "^20.10.4",
-            "@typescript-eslint/eslint-plugin": "^6.14.0",
-            "@typescript-eslint/parser": "^6.14.0",
-            "eslint": "^8.55.0",
-            "eslint-config-prettier": "^9.1.0",
-            "eslint-plugin-prettier": "^5.0.1",
-            "eslint-plugin-simple-import-sort": "^10.0.0",
+            "@types/node": "^20.10.6",
            "jest": "^29.7.0",
-            "knip": "^3.7.0",
+            "knip": "^3.9.0",
            "node-actionlint": "^1.2.2",
            "organize-imports-cli": "^0.10.0",
-            "prettier": "^3.1.1",
            "process": "^0.11.10",
            "ts-jest": "^29.1.1",
            "ts-node": "^10.9.2",
            "ts-node-dev": "^2.0.0",
-            "typedoc": "0.25.4",
+            "typedoc": "0.25.5",
            "typedoc-plugin-markdown": "3.17.1",
-            "typescript": "5.0.4"
+            "typescript": "5.3.3"
         },
         "engines": {
            "node": ">=16"
@@ -127,7 +121,7 @@
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.3.18",
+         "version": "0.3.29",
         "dev": true,
         "license": "ISC",
         "dependencies": {
@@ -1306,26 +1300,20 @@
      "@koush/werift-src": {
         "version": "file:../../external/werift",
         "requires": {
+            "@biomejs/biome": "^1.4.1",
            "@types/jest": "^29.5.11",
-            "@types/node": "^20.10.4",
-            "@typescript-eslint/eslint-plugin": "^6.14.0",
-            "@typescript-eslint/parser": "^6.14.0",
-            "eslint": "^8.55.0",
-            "eslint-config-prettier": "^9.1.0",
-            "eslint-plugin-prettier": "^5.0.1",
-            "eslint-plugin-simple-import-sort": "^10.0.0",
+            "@types/node": "^20.10.6",
            "jest": "^29.7.0",
-            "knip": "^3.7.0",
+            "knip": "^3.9.0",
            "node-actionlint": "^1.2.2",
            "organize-imports-cli": "^0.10.0",
-            "prettier": "^3.1.1",
            "process": "^0.11.10",
            "ts-jest": "^29.1.1",
            "ts-node": "^10.9.2",
            "ts-node-dev": "^2.0.0",
-            "typedoc": "0.25.4",
+            "typedoc": "0.25.5",
            "typedoc-plugin-markdown": "3.17.1",
-            "typescript": "5.0.4"
+            "typescript": "5.3.3"
         }
      },
      "@leichtgewicht/ip-codec": {
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.54",
+   "version": "1.2.57",
   "description": "HomeKit Plugin for Scrypted",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
--- a/plugins/homekit/src/main.ts
+++ b/plugins/homekit/src/main.ts
@@ -166,10 +166,12 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
            case MDNSAdvertiser.CIAO:
                break;
            default:
-                if (fs.existsSync('/var/run/avahi-daemon/'))
-                    advertiser = MDNSAdvertiser.AVAHI;
-                else
-                    advertiser = MDNSAdvertiser.CIAO;
+                advertiser = MDNSAdvertiser.CIAO;
+                // this avahi detection doesn't work sometimes? fails silently.
+                // if (fs.existsSync('/var/run/avahi-daemon/'))
+                //     advertiser = MDNSAdvertiser.AVAHI;
+                // else
+                //     advertiser = MDNSAdvertiser.CIAO;
                break;
        }
        return advertiser;
@@ -267,8 +269,6 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
                    },
                        undefined, 'Pairing'));
                    storageSettings.settings.pincode.persistedDefaultValue = randomPinCode();
-                    // TODO: change this value after this current default has been persisted to existing clients.
-                    // changing it now will cause existing accessories be renamed.
                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = false;

                    const mixinConsole = deviceManager.getMixinConsole(device.id, this.nativeId);
--- a/plugins/homekit/src/types/camera.ts
+++ b/plugins/homekit/src/types/camera.ts
@@ -117,7 +117,7 @@ addSupportedType({
                },
                closeRecordingStream(streamId, reason) {
                    const r = openRecordingStreams.get(streamId);
-                    r?.throw(new Error(reason?.toString()));
+                    console.log(`motion recording closed ${reason > 0 ? `(error code: ${reason})` : ''}`);
                    openRecordingStreams.delete(streamId);
                },
                updateRecordingActive(active) {
--- a/plugins/homekit/src/types/camera/camera-recording.ts
+++ b/plugins/homekit/src/types/camera/camera-recording.ts
@@ -321,6 +321,9 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
        let moov: Buffer[];

        for await (const box of generator) {
+            if (!isOpen())
+                return;
+            
            const { header, type, data } = box;
            // console.log('motion fragment box', type);

@@ -352,6 +355,8 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                    needSkip = false;
                    continue;
                }
+                if (!isOpen())
+                    return;
                const fragment = Buffer.concat(pending);
                saveFragment(i, fragment);
                pending = [];
@@ -361,8 +366,6 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                    data: fragment,
                    isLast,
                }
-                if (!isOpen())
-                    return;
                yield recordingPacket;
                if (wasLast)
                    break;
@@ -370,7 +373,7 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
        }
    }
    catch (e) {
-        console.log(`motion recording completed ${e}`);
+        console.log(`motion recording error ${e}`);
    }
    finally {
        console.log(`motion recording finished`);
--- a/plugins/homekit/src/types/camera/camera-snapshot.ts
+++ b/plugins/homekit/src/types/camera/camera-snapshot.ts
@@ -24,8 +24,6 @@ export function createSnapshotHandler(device: ScryptedDevice & VideoCamera & Cam
                width: request.width,
                height: request.height,
            },
-            // wait up to 2 seconds for the snapshot image, fallback to cached image
-            timeout: 2000,
        })
        return await mediaManager.convertMediaObjectToBuffer(media, 'image/jpeg');
    }
--- a/plugins/homekit/src/types/camera/camera-streaming.ts
+++ b/plugins/homekit/src/types/camera/camera-streaming.ts
@@ -354,15 +354,11 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
            if (twoWayAudio) {
                let rtspServer: RtspServer;
                let track: string;
-                let playing = false;
-                session.audioReturn.once('message', async buffer => {
+                let twoWayAudioState: 'stopped' | 'starting' | 'started' = 'stopped';
+
+                const start = async () => {
                    try {
-                        const decrypted = srtpSession.decrypt(buffer);
-                        const rtp = RtpPacket.deSerialize(decrypted);
-
-                        if (rtp.header.payloadType !== session.startRequest.audio.pt)
-                            return;
-
+                        twoWayAudioState = 'starting';
                        const { clientPromise, url } = await listenZeroSingleClient();
                        const rtspUrl = url.replace('tcp', 'rtsp');
                        let sdp = createReturnAudioSdp(session.startRequest.audio);
@@ -393,7 +389,7 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
                            device.stopIntercom();
                            client.destroy();
                            rtspServer = undefined;
-                            playing = false;
+                            twoWayAudioState = 'stopped';
                        }
                        // stop the intercom if the client dies for any reason.
                        // allow the streaming session to continue however.
@@ -402,16 +398,17 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame

                        rtspServer = new RtspServer(client, sdp);
                        await rtspServer.handlePlayback();
-                        playing = true;
+                        twoWayAudioState = 'started';
                    }
                    catch (e) {
                        console.error('two way audio failed', e);
+                        twoWayAudioState = 'stopped';
                    }
-                });
+                };

                const srtpSession = new SrtpSession(session.aconfig);
                session.audioReturn.on('message', buffer => {
-                    if (!playing)
+                    if (twoWayAudioState === 'starting')
                        return;

                    const decrypted = srtpSession.decrypt(buffer);
@@ -420,6 +417,9 @@ export function createCameraStreamingDelegate(device: ScryptedDevice & VideoCame
                    if (rtp.header.payloadType !== session.startRequest.audio.pt)
                        return;

+                    if (twoWayAudioState !== 'started')
+                        return start();
+
                    rtspServer.sendTrack(track, decrypted, false);
                });
            }
--- a/plugins/homekit/src/types/windowcovering.ts
+++ b/plugins/homekit/src/types/windowcovering.ts
@@ -1,4 +1,4 @@
-import { Entry, EntrySensor, ScryptedDevice, ScryptedDeviceType, ScryptedInterface } from '@scrypted/sdk';
+import { Brightness, Entry, EntrySensor, ScryptedDevice, ScryptedDeviceType, ScryptedInterface } from '@scrypted/sdk';
 import { addSupportedType, bindCharacteristic, DummyDevice, } from '../common';
 import { Characteristic, CharacteristicEventTypes, CharacteristicSetCallback, CharacteristicValue, NodeCallback, Service } from '../hap';
 import { makeAccessory } from './common';
@@ -7,38 +7,62 @@ import type { HomeKitPlugin } from "../main";
 addSupportedType({
    type: ScryptedDeviceType.WindowCovering,
    probe(device: DummyDevice): boolean {
-        return device.interfaces.includes(ScryptedInterface.Entry) && device.interfaces.includes(ScryptedInterface.EntrySensor);
+        return (device.interfaces.includes(ScryptedInterface.Entry) && device.interfaces.includes(ScryptedInterface.EntrySensor))
+            || device.interfaces.includes(ScryptedInterface.Brightness);
    },
-    getAccessory: async (device: ScryptedDevice & Entry & EntrySensor, homekitPlugin: HomeKitPlugin) => {
+    getAccessory: async (device: ScryptedDevice & Entry & EntrySensor & Brightness, homekitPlugin: HomeKitPlugin) => {
        const accessory = makeAccessory(device, homekitPlugin);

        const service = accessory.addService(Service.WindowCovering, device.name);

-        bindCharacteristic(device, ScryptedInterface.EntrySensor, service, Characteristic.CurrentPosition,
-            () => !!device.entryOpen ? 100 : 0);
+        if (device.interfaces.includes(ScryptedInterface.Entry)) {
+            bindCharacteristic(device, ScryptedInterface.EntrySensor, service, Characteristic.CurrentPosition,
+                () => !!device.entryOpen ? 100 : 0);

-        bindCharacteristic(device, ScryptedInterface.EntrySensor, service, Characteristic.TargetPosition,
-            () => !!device.entryOpen ? 100 : 0);
+            let targetPosition = !!device.entryOpen ? 100 : 0;
+            bindCharacteristic(device, ScryptedInterface.EntrySensor, service, Characteristic.TargetPosition,
+                () => targetPosition);

-        let props = {
-            minValue: 0,
-            maxValue: 100,
-            minStep: 100,
-        };
-        let targetState = !!device.entryOpen ? 100 : 0;
-        service.getCharacteristic(Characteristic.TargetPosition)
-            .setProps(props)
-            .on(CharacteristicEventTypes.SET, (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
-                callback();
-                if (value === 100) {
-                    targetState = 100;
-                    device.openEntry();
-                }
-                else {
-                    targetState = 0;
-                    device.closeEntry();
-                }
-            })
+            const props = {
+                minValue: 0,
+                maxValue: 100,
+                minStep: 100,
+            };
+            service.getCharacteristic(Characteristic.TargetPosition)
+                .setProps(props)
+                .on(CharacteristicEventTypes.SET, (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
+                    callback();
+                    if (value === 100) {
+                        targetPosition = 100;
+                        device.openEntry();
+                    }
+                    else {
+                        targetPosition = 0;
+                        device.closeEntry();
+                    }
+                });
+        }
+        else if (device.interfaces.includes(ScryptedInterface.Brightness)) {
+            bindCharacteristic(device, ScryptedInterface.Brightness, service, Characteristic.CurrentPosition,
+                () => device.brightness || 0);
+
+            let targetPosition = device.brightness || 0;
+            bindCharacteristic(device, ScryptedInterface.Brightness, service, Characteristic.TargetPosition,
+                () => targetPosition);
+
+            const props = {
+                minValue: 0,
+                maxValue: 100,
+                minStep: 1,
+            };
+            service.getCharacteristic(Characteristic.TargetPosition)
+                .setProps(props)
+                .on(CharacteristicEventTypes.SET, (value: CharacteristicValue, callback: CharacteristicSetCallback) => {
+                    callback();
+                    targetPosition = value as number;
+                    device.setBrightness(targetPosition);
+                });
+        }

        return accessory;
    }
--- a/plugins/objectdetector/package-lock.json
+++ b/plugins/objectdetector/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/objectdetector",
-   "version": "0.1.39",
+   "version": "0.1.42",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/objectdetector",
-         "version": "0.1.39",
+         "version": "0.1.42",
         "license": "Apache-2.0",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/objectdetector/package.json
+++ b/plugins/objectdetector/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/objectdetector",
-   "version": "0.1.39",
+   "version": "0.1.42",
   "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
   "author": "Scrypted",
   "license": "Apache-2.0",
--- a/plugins/objectdetector/src/main.ts
+++ b/plugins/objectdetector/src/main.ts
@@ -1159,7 +1159,7 @@ export class ObjectDetectionPlugin extends AutoenableMixinProvider implements Se
  async releaseDevice(id: string, nativeId: string): Promise<void> {
    if (nativeId?.startsWith(SMART_MOTIONSENSOR_PREFIX)) {
      const smart = this.devices.get(nativeId) as SmartMotionSensor;
-      smart?.listener?.removeListener();
+      smart?.detectionListener?.removeListener();
    }
  }

--- a/plugins/objectdetector/src/smart-motionsensor.ts
+++ b/plugins/objectdetector/src/smart-motionsensor.ts
@@ -1,9 +1,10 @@
 import sdk, { Camera, EventListenerRegister, MediaObject, MotionSensor, ObjectDetector, ObjectsDetected, Readme, RequestPictureOptions, ResponsePictureOptions, ScryptedDevice, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedNativeId, Setting, SettingValue, Settings } from "@scrypted/sdk";
 import { StorageSetting, StorageSettings } from "@scrypted/sdk/storage-settings";
-import type { ObjectDetectionPlugin } from "./main";
 import { levenshteinDistance } from "./edit-distance";
+import type { ObjectDetectionPlugin } from "./main";

 export const SMART_MOTIONSENSOR_PREFIX = 'smart-motionsensor-';
+export const SMART_OCCUPANCYSENSOR_PREFIX = 'smart-occupancysensor-';

 export function createObjectDetectorStorageSetting(): StorageSetting {
    return {
@@ -26,7 +27,7 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
        },
        detectionTimeout: {
            title: 'Object Detection Timeout',
-            description: 'Duration in seconds the sensor will report motion, before resetting.',
+            description: 'Duration in seconds the sensor will report motion, before resetting. Setting this to 0 will reset the sensor when motion stops.',
            type: 'number',
            defaultValue: 60,
        },
@@ -71,9 +72,17 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
            type: 'number',
            defaultValue: 2,
        },
+        labelScore: {
+            group: 'Recognition',
+            title: 'Label Score',
+            description: 'The minimum score required for a label to trigger the motion sensor.',
+            type: 'number',
+            defaultValue: 0,
+        }
    });

-    listener: EventListenerRegister;
+    detectionListener: EventListenerRegister;
+    motionListener: EventListenerRegister;
    timeout: NodeJS.Timeout;
    lastPicture: Promise<MediaObject>;

@@ -143,8 +152,10 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R

    trigger() {
        this.resetTrigger();
-        const duration: number = this.storageSettings.values.detectionTimeout;
        this.motionDetected = true;
+        const duration: number = this.storageSettings.values.detectionTimeout;
+        if (!duration)
+            return;
        this.timeout = setTimeout(() => {
            this.motionDetected = false;
        }, duration * 1000);
@@ -152,12 +163,14 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R

    rebind() {
        this.motionDetected = false;
-        this.listener?.removeListener();
-        this.listener = undefined;
+        this.detectionListener?.removeListener();
+        this.detectionListener = undefined;
+        this.motionListener?.removeListener();
+        this.motionListener = undefined;
        this.resetTrigger();


-        const objectDetector: ObjectDetector & ScryptedDevice = this.storageSettings.values.objectDetector;
+        const objectDetector: ObjectDetector & MotionSensor & ScryptedDevice = this.storageSettings.values.objectDetector;
        if (!objectDetector)
            return;

@@ -167,13 +180,25 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R

        const console = sdk.deviceManager.getMixinConsole(objectDetector.id, this.nativeId);

-        this.listener = objectDetector.listen(ScryptedInterface.ObjectDetector, (source, details, data) => {
+        this.motionListener = objectDetector.listen({
+            event: ScryptedInterface.MotionSensor,
+            watch: true,
+        }, (source, details, data) => {
+            const duration: number = this.storageSettings.values.detectionTimeout;
+            if (duration)
+                return;
+
+            if (!objectDetector.motionDetected)
+                this.motionDetected = false;
+        });
+
+        this.detectionListener = objectDetector.listen(ScryptedInterface.ObjectDetector, (source, details, data) => {
            const detected: ObjectsDetected = data;

            if (this.storageSettings.values.requireDetectionThumbnail && !detected.detectionId)
                return false;

-            const { labels, labelDistance } = this.storageSettings.values;
+            const { labels, labelDistance, labelScore } = this.storageSettings.values;

            const match = detected.detections?.find(d => {
                if (this.storageSettings.values.requireScryptedNvrDetections && !d.boundingBox)
@@ -208,13 +233,24 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
                    return false;

                for (const label of labels) {
-                    if (label === d.label)
-                        return true;
+                    if (label === d.label) {
+                        if (!labelScore || d.labelScore >= labelScore)
+                            return true;
+                        this.console.log('Label score too low.', d.labelScore);
+                        continue;
+                    }
+
                    if (!labelDistance)
                        continue;
-                    if (levenshteinDistance(label, d.label) <= labelDistance)
+
+                    if (levenshteinDistance(label, d.label) > labelDistance) {
+                        this.console.log('Label does not match.', label, d.label, d.labelScore);
+                        continue;
+                    }
+
+                    if (!labelScore || d.labelScore >= labelScore)
                        return true;
-                    this.console.log('No label does not match.', label, d.label);
+                    this.console.log('Label score too low.', d.labelScore);
                }

                return false;
--- a/plugins/onnx/.gitignore
+++ b/plugins/onnx/.gitignore
--- a/plugins/tensorflow/.npmignore
+++ b/plugins/tensorflow/.npmignore
@@ -9,6 +9,7 @@ dist/*.js
 dist/*.txt
 __pycache__
 all_models
-.venv
+sort_oh
 download_models.sh
 tsconfig.json
+.venv
--- a/plugins/onnx/.vscode/launch.json
+++ b/plugins/onnx/.vscode/launch.json
--- a/plugins/onnx/.vscode/settings.json
+++ b/plugins/onnx/.vscode/settings.json
@@ -0,0 +1,25 @@
+
+{
+    // docker installation
+    "scrypted.debugHost": "koushik-ubuntuvm",
+    "scrypted.serverRoot": "/server",
+
+    // lxc
+    // "scrypted.debugHost": "scrypted-server",
+    // "scrypted.serverRoot": "/root/.scrypted",
+ 
+    // pi local installation
+    // "scrypted.debugHost": "192.168.2.119",
+    // "scrypted.serverRoot": "/home/pi/.scrypted",
+
+    // local checkout
+    // "scrypted.debugHost": "127.0.0.1",
+    // "scrypted.serverRoot": "/Users/koush/.scrypted",
+    // "scrypted.debugHost": "koushik-winvm",
+    // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",
+
+    "scrypted.pythonRemoteRoot": "${config:scrypted.serverRoot}/volume/plugin.zip",
+    "python.analysis.extraPaths": [
+        "./node_modules/@scrypted/sdk/types/scrypted_python"
+    ]
+}
--- a/plugins/onnx/.vscode/tasks.json
+++ b/plugins/onnx/.vscode/tasks.json
--- a/plugins/onnx/README.md
+++ b/plugins/onnx/README.md
@@ -0,0 +1,6 @@
+# ONNX Object Detection for Scrypted
+
+This plugin adds object detection capabilities to any camera in Scrypted. Having a fast GPU and CPU is highly recommended.
+
+The ONNX Plugin should only be used if you are a Scrypted NVR user. It will provide no
+benefits to HomeKit, which does its own detection processing.
--- a/plugins/tensorflow/package-lock.json
+++ b/plugins/tensorflow/package-lock.json
@@ -1,47 +1,48 @@
 {
-   "name": "@scrypted/tensorflow-lite",
-   "version": "0.1.18",
+   "name": "@scrypted/openvino",
+   "version": "0.1.103",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
-         "name": "@scrypted/tensorflow-lite",
-         "version": "0.1.18",
+         "name": "@scrypted/openvino",
+         "version": "0.1.103",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.39",
+         "version": "0.3.29",
         "dev": true,
         "license": "ISC",
         "dependencies": {
-            "@babel/preset-typescript": "^7.16.7",
+            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
-            "babel-loader": "^8.2.3",
+            "axios": "^1.6.5",
+            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
            "ncp": "^2.0.0",
            "raw-loader": "^4.0.2",
            "rimraf": "^3.0.2",
            "tmp": "^0.2.1",
-            "typescript": "^4.9.3",
-            "webpack": "^5.74.0",
+            "ts-loader": "^9.4.2",
+            "typescript": "^4.9.4",
+            "webpack": "^5.75.0",
            "webpack-bundle-analyzer": "^4.5.0"
         },
         "bin": {
+            "scrypted-changelog": "bin/scrypted-changelog.js",
            "scrypted-debug": "bin/scrypted-debug.js",
            "scrypted-deploy": "bin/scrypted-deploy.js",
            "scrypted-deploy-debug": "bin/scrypted-deploy-debug.js",
            "scrypted-package-json": "bin/scrypted-package-json.js",
-            "scrypted-readme": "bin/scrypted-readme.js",
            "scrypted-setup-project": "bin/scrypted-setup-project.js",
            "scrypted-webpack": "bin/scrypted-webpack.js"
         },
         "devDependencies": {
-            "@types/node": "^18.11.9",
+            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "stringify-object": "^3.3.0",
            "ts-node": "^10.4.0",
@@ -60,12 +61,12 @@
      "@scrypted/sdk": {
         "version": "file:../../sdk",
         "requires": {
-            "@babel/preset-typescript": "^7.16.7",
-            "@types/node": "^18.11.9",
+            "@babel/preset-typescript": "^7.18.6",
+            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
-            "babel-loader": "^8.2.3",
+            "axios": "^1.6.5",
+            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
            "ncp": "^2.0.0",
@@ -73,10 +74,11 @@
            "rimraf": "^3.0.2",
            "stringify-object": "^3.3.0",
            "tmp": "^0.2.1",
+            "ts-loader": "^9.4.2",
            "ts-node": "^10.4.0",
            "typedoc": "^0.23.21",
-            "typescript": "^4.9.3",
-            "webpack": "^5.74.0",
+            "typescript": "^4.9.4",
+            "webpack": "^5.75.0",
            "webpack-bundle-analyzer": "^4.5.0"
         }
      }
--- a/plugins/tensorflow/package.json
+++ b/plugins/tensorflow/package.json
@@ -1,11 +1,11 @@
 {
-   "name": "@scrypted/tensorflow",
-   "description": "Scrypted TensorFlow Object Detection",
+   "name": "@scrypted/onnx",
+   "description": "Scrypted ONNX Object Detection",
   "keywords": [
      "scrypted",
      "plugin",
-      "coreml",
-      "neural",
+      "onnx",
+      "motion",
      "object",
      "detect",
      "detection",
@@ -26,14 +26,14 @@
      "scrypted-package-json": "scrypted-package-json"
   },
   "scrypted": {
-      "name": "TensorFlow Object Detection",
+      "name": "ONNX Object Detection",
      "pluginDependencies": [
-         "@scrypted/objectdetector",
-         "@scrypted/python-codecs"
+         "@scrypted/objectdetector"
      ],
      "runtime": "python",
      "type": "API",
      "interfaces": [
+         "DeviceProvider",
         "Settings",
         "ObjectDetection",
         "ObjectDetectionPreview"
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.18"
+   "version": "0.1.103"
 }
--- a/plugins/onnx/src/common
+++ b/plugins/onnx/src/common
@@ -0,0 +1 @@
+../../openvino/src/common
--- a/plugins/onnx/src/detect
+++ b/plugins/onnx/src/detect
@@ -0,0 +1 @@
+../../openvino/src/detect/
--- a/plugins/onnx/src/main.py
+++ b/plugins/onnx/src/main.py
@@ -0,0 +1,4 @@
+from ort import ONNXPlugin
+
+def create_scrypted_plugin():
+    return ONNXPlugin()
--- a/plugins/onnx/src/ort/init.py
+++ b/plugins/onnx/src/ort/init.py
@@ -0,0 +1,258 @@
+from __future__ import annotations
+
+import ast
+import asyncio
+import concurrent.futures
+import json
+import platform
+import sys
+import threading
+import traceback
+from typing import Any, Tuple
+
+import numpy as np
+import onnxruntime
+import scrypted_sdk
+from PIL import Image
+from scrypted_sdk.other import SettingValue
+from scrypted_sdk.types import Setting
+
+import common.yolo as yolo
+from predict import PredictPlugin
+
+from .face_recognition import ONNXFaceRecognition
+
+try:
+    from .text_recognition import ONNXTextRecognition
+except:
+    ONNXTextRecognition = None
+
+availableModels = [
+    "Default",
+    "scrypted_yolov10m_320",
+    "scrypted_yolov10n_320",
+    "scrypted_yolo_nas_s_320",
+    "scrypted_yolov6n_320",
+    "scrypted_yolov6s_320",
+    "scrypted_yolov9c_320",
+    "scrypted_yolov9s_320",
+    "scrypted_yolov9t_320",
+    "scrypted_yolov8n_320",
+]
+
+def parse_labels(names):
+    j = ast.literal_eval(names)
+    ret = {}
+    for k, v in j.items():
+        ret[int(k)] = v
+    return ret
+
+class ONNXPlugin(
+    PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Settings, scrypted_sdk.DeviceProvider
+):
+    def __init__(self, nativeId: str | None = None):
+        super().__init__(nativeId=nativeId)
+
+        model = self.storage.getItem("model") or "Default"
+        if model == "Default" or model not in availableModels:
+            if model != "Default":
+                self.storage.setItem("model", "Default")
+            model = "scrypted_yolov9c_320"
+        self.yolo = "yolo" in model
+        self.scrypted_yolov10 = "scrypted_yolov10" in model
+        self.scrypted_yolo_nas = "scrypted_yolo_nas" in model
+        self.scrypted_yolo = "scrypted_yolo" in model
+        self.scrypted_model = "scrypted" in model
+
+        print(f"model {model}")
+
+        onnxmodel = model if self.scrypted_yolo_nas else "best" if self.scrypted_model else model
+
+        model_version = "v3"
+        onnxfile = self.downloadFile(
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
+            f"{model_version}/{model}/{onnxmodel}.onnx",
+        )
+
+        print(onnxfile)
+
+        deviceIds = self.storage.getItem("deviceIds") or '["0"]'
+        deviceIds = json.loads(deviceIds)
+        if not len(deviceIds):
+            deviceIds = ["0"]
+        self.deviceIds = deviceIds
+
+        compiled_models = []
+        self.compiled_models = {}
+
+        try:
+            for deviceId in deviceIds:
+                sess_options = onnxruntime.SessionOptions()
+
+                providers: list[str] = []
+                if sys.platform == 'darwin':
+                    providers.append("CoreMLExecutionProvider")
+
+                if ('linux' in sys.platform or 'win' in sys.platform) and platform.machine() == 'x86_64':
+                    deviceId = int(deviceId)
+                    providers.append(("CUDAExecutionProvider", { "device_id": deviceId }))
+
+                providers.append('CPUExecutionProvider')
+
+                compiled_model = onnxruntime.InferenceSession(onnxfile, sess_options=sess_options, providers=providers)
+                compiled_models.append(compiled_model)
+
+                input = compiled_model.get_inputs()[0]
+                self.model_dim = input.shape[2]
+                self.input_name = input.name
+                self.labels = parse_labels(compiled_model.get_modelmeta().custom_metadata_map['names'])
+
+        except:
+            import traceback
+
+            traceback.print_exc()
+            print("Reverting all settings.")
+            self.storage.removeItem("model")
+            self.storage.removeItem("deviceIds")
+            self.requestRestart()
+
+        def executor_initializer():
+            thread_name = threading.current_thread().name
+            interpreter = compiled_models.pop()
+            self.compiled_models[thread_name] = interpreter
+            print('Runtime initialized on thread {}'.format(thread_name))
+
+        self.executor = concurrent.futures.ThreadPoolExecutor(
+            initializer=executor_initializer,
+            max_workers=len(compiled_models),
+            thread_name_prefix="onnx",
+        )
+
+        self.prepareExecutor = concurrent.futures.ThreadPoolExecutor(
+            max_workers=len(compiled_models),
+            thread_name_prefix="onnx-prepare",
+        )
+
+        self.faceDevice = None
+        self.textDevice = None
+        asyncio.ensure_future(self.prepareRecognitionModels(), loop=self.loop)
+
+    async def prepareRecognitionModels(self):
+        try:
+            devices = [
+                {
+                    "nativeId": "facerecognition",
+                    "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
+                    "interfaces": [
+                        scrypted_sdk.ScryptedInterface.ObjectDetection.value,
+                    ],
+                    "name": "ONNX Face Recognition",
+                },
+            ]
+
+            if ONNXTextRecognition:
+                devices.append(
+                    {
+                        "nativeId": "textrecognition",
+                        "type": scrypted_sdk.ScryptedDeviceType.Builtin.value,
+                        "interfaces": [
+                            scrypted_sdk.ScryptedInterface.ObjectDetection.value,
+                        ],
+                        "name": "ONNX Text Recognition",
+                    },
+                )
+
+            await scrypted_sdk.deviceManager.onDevicesChanged(
+                {
+                    "devices": devices,
+                }
+            )
+        except:
+            pass
+
+    async def getDevice(self, nativeId: str) -> Any:
+        if nativeId == "facerecognition":
+            self.faceDevice = self.faceDevice or ONNXFaceRecognition(self, nativeId)
+            return self.faceDevice
+        elif nativeId == "textrecognition":
+            self.textDevice = self.textDevice or ONNXTextRecognition(self, nativeId)
+            return self.textDevice
+        raise Exception("unknown device")
+
+    async def getSettings(self) -> list[Setting]:
+        model = self.storage.getItem("model") or "Default"
+        deviceIds = self.storage.getItem("deviceIds") or '["0"]'
+        deviceIds = json.loads(deviceIds)
+
+        return [
+            {
+                "key": "model",
+                "title": "Model",
+                "description": "The detection model used to find objects.",
+                "choices": availableModels,
+                "value": model,
+            },
+            {
+                "key": "deviceIds",
+                "title": "Device IDs",
+                "description": "Optional: Assign multiple CUDA Device IDs to use for detection.",
+                "choices": deviceIds,
+                "combobox": True,
+                "multiple": True,
+                "value": deviceIds,
+            },
+            {
+                "key": "execution_device",
+                "title": "Execution Device",
+                "readonly": True,
+                "value": onnxruntime.get_device(),
+            }
+        ]
+
+    async def putSetting(self, key: str, value: SettingValue):
+        if (key == 'deviceIds'):
+            value = json.dumps(value)
+        self.storage.setItem(key, value)
+        await self.onDeviceEvent(scrypted_sdk.ScryptedInterface.Settings.value, None)
+        self.requestRestart()
+
+    # width, height, channels
+    def get_input_details(self) -> Tuple[int, int, int]:
+        return [self.model_dim, self.model_dim, 3]
+
+    def get_input_size(self) -> Tuple[int, int]:
+        return [self.model_dim, self.model_dim]
+
+    async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
+        def prepare(): 
+            im = np.array(input)
+            im = np.expand_dims(input, axis=0)
+            im = im.transpose((0, 3, 1, 2))  # BHWC to BCHW, (n, 3, h, w)
+            im = im.astype(np.float32) / 255.0
+            im = np.ascontiguousarray(im)  # contiguous
+            return im
+
+        def predict(input_tensor):
+            compiled_model = self.compiled_models[threading.current_thread().name]
+            output_tensors = compiled_model.run(None, { self.input_name: input_tensor })
+            if self.scrypted_yolov10:
+                return yolo.parse_yolov10(output_tensors[0][0])
+            if self.scrypted_yolo_nas:
+                return yolo.parse_yolo_nas([output_tensors[1], output_tensors[0]])
+            return yolo.parse_yolov9(output_tensors[0][0])
+
+        try:
+            input_tensor = await asyncio.get_event_loop().run_in_executor(
+                self.prepareExecutor, lambda: prepare()
+            )
+            objs = await asyncio.get_event_loop().run_in_executor(
+                self.executor, lambda: predict(input_tensor)
+            )
+
+        except:
+
+            traceback.print_exc()
+            raise
+
+        ret = self.create_detection_result(objs, src_size, cvss)
+        return ret
--- a/plugins/onnx/src/ort/face_recognition.py
+++ b/plugins/onnx/src/ort/face_recognition.py
@@ -0,0 +1,112 @@
+from __future__ import annotations
+
+import asyncio
+import concurrent.futures
+import platform
+import sys
+import threading
+
+import numpy as np
+import onnxruntime
+from PIL import Image
+
+from predict.face_recognize import FaceRecognizeDetection
+
+
+class ONNXFaceRecognition(FaceRecognizeDetection):
+    def __init__(self, plugin, nativeId: str | None = None):
+        self.plugin = plugin
+
+        super().__init__(nativeId=nativeId)
+
+    def downloadModel(self, model: str):
+        onnxmodel = "best" if "scrypted" in model else model
+        model_version = "v1"
+        onnxfile = self.downloadFile(
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
+            f"{model_version}/{model}/{onnxmodel}.onnx",
+        )
+        print(onnxfile)
+
+        compiled_models_array = []
+        compiled_models = {}
+        deviceIds = self.plugin.deviceIds
+
+        for deviceId in deviceIds:
+            sess_options = onnxruntime.SessionOptions()
+
+            providers: list[str] = []
+            if sys.platform == "darwin":
+                providers.append("CoreMLExecutionProvider")
+
+            if "linux" in sys.platform and platform.machine() == "x86_64":
+                deviceId = int(deviceId)
+                providers.append(("CUDAExecutionProvider", {"device_id": deviceId}))
+
+            providers.append("CPUExecutionProvider")
+
+            compiled_model = onnxruntime.InferenceSession(
+                onnxfile, sess_options=sess_options, providers=providers
+            )
+            compiled_models_array.append(compiled_model)
+
+            input = compiled_model.get_inputs()[0]
+            input_name = input.name
+
+        def executor_initializer():
+            thread_name = threading.current_thread().name
+            interpreter = compiled_models_array.pop()
+            compiled_models[thread_name] = interpreter
+            print("Runtime initialized on thread {}".format(thread_name))
+
+        executor = concurrent.futures.ThreadPoolExecutor(
+            initializer=executor_initializer,
+            max_workers=len(compiled_models_array),
+            thread_name_prefix="face",
+        )
+
+        prepareExecutor = concurrent.futures.ThreadPoolExecutor(
+            max_workers=len(compiled_models_array),
+            thread_name_prefix="face-prepare",
+        )
+
+        return compiled_models, input_name, prepareExecutor, executor
+
+    async def predictDetectModel(self, input: Image.Image):
+        compiled_models, input_name, prepareExecutor, executor = self.detectModel
+
+        def prepare():
+            im = np.array(input)
+            im = np.expand_dims(input, axis=0)
+            im = im.transpose((0, 3, 1, 2))  # BHWC to BCHW, (n, 3, h, w)
+            im = im.astype(np.float32) / 255.0
+            im = np.ascontiguousarray(im)  # contiguous
+            return im
+
+        def predict(input_tensor):
+            compiled_model = compiled_models[threading.current_thread().name]
+            output_tensors = compiled_model.run(None, {input_name: input_tensor})
+            return output_tensors
+
+        input_tensor = await asyncio.get_event_loop().run_in_executor(
+            prepareExecutor, lambda: prepare()
+        )
+        objs = await asyncio.get_event_loop().run_in_executor(
+            executor, lambda: predict(input_tensor)
+        )
+
+        return objs[0][0]
+
+    async def predictFaceModel(self, input: np.ndarray):
+        compiled_models, input_name, prepareExecutor, executor = self.faceModel
+
+        def predict():
+            compiled_model = compiled_models[threading.current_thread().name]
+            output_tensors = compiled_model.run(None, {input_name: input})
+            return output_tensors
+
+        objs = await asyncio.get_event_loop().run_in_executor(
+            executor, lambda: predict()
+        )
+
+        return objs[0]
--- a/plugins/onnx/src/ort/text_recognition.py
+++ b/plugins/onnx/src/ort/text_recognition.py
@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+import asyncio
+import concurrent.futures
+import platform
+import sys
+import threading
+
+import numpy as np
+import onnxruntime
+from PIL import Image
+
+from predict.text_recognize import TextRecognition
+
+
+class ONNXTextRecognition(TextRecognition):
+    def __init__(self, plugin, nativeId: str | None = None):
+        self.plugin = plugin
+
+        super().__init__(nativeId=nativeId)
+
+    def downloadModel(self, model: str):
+        onnxmodel = model
+        model_version = "v4"
+        onnxfile = self.downloadFile(
+            f"https://github.com/koush/onnx-models/raw/main/{model}/{onnxmodel}.onnx",
+            f"{model_version}/{model}/{onnxmodel}.onnx",
+        )
+        print(onnxfile)
+
+        compiled_models_array = []
+        compiled_models = {}
+        deviceIds = self.plugin.deviceIds
+
+        for deviceId in deviceIds:
+            sess_options = onnxruntime.SessionOptions()
+
+            providers: list[str] = []
+            if sys.platform == "darwin":
+                providers.append("CoreMLExecutionProvider")
+
+            if "linux" in sys.platform and platform.machine() == "x86_64":
+                deviceId = int(deviceId)
+                providers.append(("CUDAExecutionProvider", {"device_id": deviceId}))
+
+            providers.append("CPUExecutionProvider")
+
+            compiled_model = onnxruntime.InferenceSession(
+                onnxfile, sess_options=sess_options, providers=providers
+            )
+            compiled_models_array.append(compiled_model)
+
+            input = compiled_model.get_inputs()[0]
+            input_name = input.name
+
+        def executor_initializer():
+            thread_name = threading.current_thread().name
+            interpreter = compiled_models_array.pop()
+            compiled_models[thread_name] = interpreter
+            print("Runtime initialized on thread {}".format(thread_name))
+
+        executor = concurrent.futures.ThreadPoolExecutor(
+            initializer=executor_initializer,
+            max_workers=len(compiled_models_array),
+            thread_name_prefix="text",
+        )
+
+        prepareExecutor = concurrent.futures.ThreadPoolExecutor(
+            max_workers=len(compiled_models_array),
+            thread_name_prefix="text-prepare",
+        )
+
+        return compiled_models, input_name, prepareExecutor, executor
+
+    async def predictDetectModel(self, input: Image.Image):
+        compiled_models, input_name, prepareExecutor, executor = self.detectModel
+
+        def predict():
+            compiled_model = compiled_models[threading.current_thread().name]
+            output_tensors = compiled_model.run(None, {input_name: input})
+            return output_tensors
+
+        objs = await asyncio.get_event_loop().run_in_executor(
+            executor, lambda: predict()
+        )
+
+        return objs[0]
+
+    async def predictTextModel(self, input: np.ndarray):
+        input = input.astype(np.float32)
+        compiled_models, input_name, prepareExecutor, executor = self.textModel
+
+        def predict():
+            compiled_model = compiled_models[threading.current_thread().name]
+            output_tensors = compiled_model.run(None, {input_name: input})
+            return output_tensors
+
+        objs = await asyncio.get_event_loop().run_in_executor(
+            executor, lambda: predict()
+        )
+
+        return objs[0]
--- a/plugins/onnx/src/predict
+++ b/plugins/onnx/src/predict
@@ -0,0 +1 @@
+../../openvino/src/predict
--- a/plugins/onnx/src/requirements.optional.txt
+++ b/plugins/onnx/src/requirements.optional.txt
@@ -0,0 +1 @@
+opencv-python==4.10.0.82
--- a/plugins/onnx/src/requirements.txt
+++ b/plugins/onnx/src/requirements.txt
@@ -0,0 +1,13 @@
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
+
+# uncomment to require cuda 12, but most stuff is still targetting cuda 11.
+# however, stuff targetted for cuda 11 can still run on cuda 12.
+# --extra-index-url https://aiinfra.pkgs.visualstudio.com/PublicPackages/_packaging/onnxruntime-cuda-12/pypi/simple/
+onnxruntime-gpu; 'linux' in sys_platform and platform_machine == 'x86_64'
+# cpu and coreml execution provider
+onnxruntime; 'linux' not in sys_platform or platform_machine != 'x86_64'
+# nightly?
+# ort-nightly-gpu==1.17.3.dev20240409002
+
+Pillow==10.3.0
--- a/plugins/onnx/tsconfig.json
+++ b/plugins/onnx/tsconfig.json
--- a/plugins/opencv/package-lock.json
+++ b/plugins/opencv/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/opencv",
-   "version": "0.0.90",
+   "version": "0.0.91",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/opencv",
-         "version": "0.0.90",
+         "version": "0.0.91",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
--- a/plugins/opencv/package.json
+++ b/plugins/opencv/package.json
@@ -37,5 +37,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.0.90"
+   "version": "0.0.91"
 }
--- a/plugins/opencv/src/requirements.txt
+++ b/plugins/opencv/src/requirements.txt
@@ -1,9 +1,5 @@
-# plugin
-numpy>=1.16.2
-# pillow for anything not intel linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+# must ensure numpy is pinned to prevent dependencies with an unpinned numpy from pulling numpy>=2.0.
+numpy==1.26.4
 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' or platform_machine == 'aarch64'
+opencv-python==4.10.0.82
+Pillow==10.3.0
--- a/plugins/openvino/.vscode/settings.json
+++ b/plugins/openvino/.vscode/settings.json
@@ -4,13 +4,17 @@
    // "scrypted.debugHost": "koushik-ubuntu",
    // "scrypted.serverRoot": "/server",

+    // proxmox installation
+    "scrypted.debugHost": "scrypted-server",
+    "scrypted.serverRoot": "/root/.scrypted",
+
    // pi local installation
    // "scrypted.debugHost": "192.168.2.119",
    // "scrypted.serverRoot": "/home/pi/.scrypted",

    // 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-winvm",
    // "scrypted.serverRoot": "C:\\Users\\koush\\.scrypted",

--- a/plugins/openvino/package-lock.json
+++ b/plugins/openvino/package-lock.json
@@ -1,25 +1,25 @@
 {
   "name": "@scrypted/openvino",
-   "version": "0.1.77",
+   "version": "0.1.104",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/openvino",
-         "version": "0.1.77",
+         "version": "0.1.104",
         "devDependencies": {
            "@scrypted/sdk": "file:../../sdk"
         }
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.97",
+         "version": "0.3.29",
         "dev": true,
         "license": "ISC",
         "dependencies": {
            "@babel/preset-typescript": "^7.18.6",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
@@ -65,7 +65,7 @@
            "@types/node": "^18.11.18",
            "@types/stringify-object": "^4.0.0",
            "adm-zip": "^0.4.13",
-            "axios": "^0.21.4",
+            "axios": "^1.6.5",
            "babel-loader": "^9.1.0",
            "babel-plugin-const-enum": "^1.1.0",
            "esbuild": "^0.15.9",
--- a/plugins/openvino/package.json
+++ b/plugins/openvino/package.json
@@ -42,5 +42,5 @@
   "devDependencies": {
      "@scrypted/sdk": "file:../../sdk"
   },
-   "version": "0.1.77"
+   "version": "0.1.104"
 }
--- a/Show More
+++ b/Show More