postbeta

* Add tsconfig strict to packages/auth-fetch

* Refactor switch case

* Revert "Refactor switch case"

This reverts commit b5004664bb.

* Revert switch changes

.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.

.github/workflows/build-plugins-changed.yml

@@ -1,11 +1,11 @@
 name: Build changed plugins
 
 on:
-  push:
-    branches: ["main"]
-    paths: ["plugins/**"]
-  pull_request:
-    paths: ["plugins/**"]
+#   push:
+#     branches: ["main"]
+#     paths: ["plugins/**"]
+#   pull_request:
+#     paths: ["plugins/**"]
   workflow_dispatch:
 
 jobs:

.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

.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

.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 }}

common/fs/@types/sdk/settings-mixin.d.ts

@@ -0,0 +1 @@
+../../../../sdk/dist/src/settings-mixin.d.ts

common/fs/@types/sdk/storage-settings.d.ts

@@ -0,0 +1 @@
+../../../../sdk/dist/src/storage-settings.d.ts

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": {

common/src/eval/scrypted-eval.ts

@@ -1,9 +1,10 @@
-import sdk, { MixinDeviceBase, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptors } from "@scrypted/sdk";
+import sdk, {  MixinDeviceBase, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, ScryptedInterfaceDescriptors, ScryptedMimeTypes } from "@scrypted/sdk";
+import { StorageSettings } from "@scrypted/sdk/storage-settings";
+import { SettingsMixinDeviceBase } from "@scrypted/sdk/settings-mixin";
 import fs from 'fs';
 import type { TranspileOptions } from "typescript";
 import vm from "vm";
 import { ScriptDevice } from "./monaco/script-device";
-import path from 'path';
 
 const { systemManager, deviceManager, mediaManager, endpointManager } = sdk;
 
@@ -28,9 +29,13 @@ export function readFileAsString(f: string) {
 }
 
 function getTypeDefs() {
+    const settingsMixinDefs = readFileAsString('@types/sdk/settings-mixin.d.ts');
+    const storageSettingsDefs = readFileAsString('@types/sdk/storage-settings.d.ts');
     const scryptedTypesDefs = readFileAsString('@types/sdk/types.d.ts');
     const scryptedIndexDefs = readFileAsString('@types/sdk/index.d.ts');
     return {
+        settingsMixinDefs,
+        storageSettingsDefs,
         scryptedIndexDefs,
         scryptedTypesDefs,
     };
@@ -64,6 +69,7 @@ export async function scryptedEval(device: ScryptedDeviceBase, script: string, e
         fs: require('realfs'),
         ScryptedDeviceBase,
         MixinDeviceBase,
+        StorageSettings,
         systemManager,
         deviceManager,
         endpointManager,
@@ -73,6 +79,8 @@ export async function scryptedEval(device: ScryptedDeviceBase, script: string, e
         localStorage: device.storage,
         device,
         exports: {} as any,
+        SettingsMixinDeviceBase,
+        ScryptedMimeTypes,
         ScryptedInterface,
         ScryptedDeviceType,
         // @ts-expect-error
@@ -173,6 +181,16 @@ export function createMonacoEvalDefaults(extraLibs: { [lib: string]: string }) {
             "node_modules/@types/scrypted__sdk/types/index.d.ts"
         );
 
+        monaco.languages.typescript.typescriptDefaults.addExtraLib(
+            libs['settingsMixin'],
+            "node_modules/@types/scrypted__sdk/settings-mixin.d.ts"
+        );
+
+        monaco.languages.typescript.typescriptDefaults.addExtraLib(
+            libs['storageSettings'],
+            "node_modules/@types/scrypted__sdk/storage-settings.d.ts"
+        );
+
         monaco.languages.typescript.typescriptDefaults.addExtraLib(
             libs['sdk'],
             "node_modules/@types/scrypted__sdk/index.d.ts"

common/src/read-stream.ts

@@ -136,12 +136,17 @@ export async function readLine(readable: Readable) {
 }
 
 export async function readString(readable: Readable | Promise<Readable>) {
-  let data = '';
+  const buffer = await readBuffer(readable);
+  return buffer.toString();
+}
+
+export async function readBuffer(readable: Readable | Promise<Readable>) {
+  const buffers: Buffer[] = [];
   readable = await readable;
   readable.on('data', buffer => {
-    data += buffer.toString();
+    buffers.push(buffer);
   });
   readable.resume();
   await once(readable, 'end')
-  return data;
+  return Buffer.concat(buffers);
 }

common/tsconfig.json

@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "Node16",
+        "moduleResolution": "Node16",
         "target": "esnext",
         "noImplicitAny": true,
         "outDir": "./dist",

install/config.yaml

@@ -1,13 +1,12 @@
 # Home Assistant Addon Configuration
 name: Scrypted
-version: "18-jammy-full.s6-v0.93.0"
+version: "v0.105.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

install/docker/Dockerfile.full

@@ -7,7 +7,8 @@
 # install script.
 ################################################################
 ARG BASE="jammy"
-FROM ubuntu:${BASE} as header
+ARG REPO="ubuntu"
+FROM ${REPO}:${BASE} as header
 
 ENV DEBIAN_FRONTEND=noninteractive
 

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 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 install -c conda-forge cudatoolkit=11.2.2 cudnn=8.1.0
-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

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"
 

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.16510.2/intel-igc-core_1.0.16510.2_amd64.deb &&
+    curl -O -L https://github.com/intel/intel-graphics-compiler/releases/download/igc-1.0.16510.2/intel-igc-opencl_1.0.16510.2_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.13.29138.7/intel-level-zero-gpu-dbgsym_1.3.29138.7_amd64.ddeb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.13.29138.7/intel-level-zero-gpu_1.3.29138.7_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.13.29138.7/intel-opencl-icd-dbgsym_24.13.29138.7_amd64.ddeb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.13.29138.7/intel-opencl-icd_24.13.29138.7_amd64.deb &&
+    curl -O -L https://github.com/intel/compute-runtime/releases/download/24.13.29138.7/libigdgmm12_22.3.18_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."

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

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"

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"

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

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"?>

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,
 });
 "@
 

install/local/install-scrypted-proxmox.sh

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

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

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);
     }

packages/auth-fetch/tsconfig.json

@@ -9,6 +9,7 @@
         "inlineSources": true,
         "declaration": true,
         "resolveJsonModule": true,
+        "strict": true
     },
     "include": [
         "src/**/*"

packages/cli/package-lock.json

@@ -1,16 +1,16 @@
 {
   "name": "scrypted",
-  "version": "1.3.13",
+  "version": "1.3.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "scrypted",
-      "version": "1.3.13",
+      "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",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrypted",
-  "version": "1.3.13",
+  "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",

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);

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.
@@ -133,11 +161,7 @@ export async function serveMain(installVersion?: string) {
 
         await startServer(installDir);
 
-        if (fs.existsSync(EXIT_FILE)) {
-            console.log('Exiting.');
-            process.exit(1);
-        }
-        else if (fs.existsSync(UPDATE_FILE)) {
+        if (fs.existsSync(UPDATE_FILE)) {
             console.log('Update requested. Installing.');
             await runCommandEatError('npm', '--prefix', installDir, 'install', '--production', '@scrypted/server@latest').catch(e => {
                 console.error('Update failed', e);
@@ -145,6 +169,10 @@ export async function serveMain(installVersion?: string) {
             console.log('Exiting.');
             process.exit(1);
         }
+        else if (fs.existsSync(EXIT_FILE)) {
+            console.log('Exiting.');
+            process.exit(1);
+        }
         else {
             console.log(`Service unexpectedly exited. Restarting momentarily.`);
             await sleep(10000);

packages/cli/tsconfig.json

@@ -9,6 +9,7 @@
       "inlineSources": true,
       "declaration": true,
       "moduleResolution": "Node16",
+      "strict": true
   },
   "include": [
       "src/**/*"

plugins/alexa/.vscode/settings.json

@@ -1,4 +1,4 @@
 
 {
-    "scrypted.debugHost": "scrypted-server",
+    "scrypted.debugHost": "127.0.0.1",
 }

plugins/alexa/CHANGELOG.md

@@ -1,6 +1,11 @@
 <details>
 <summary>Changelog</summary>
 
+### 0.3.1
+
+alexa/google-home: fix potential vulnerability. do not allow local network control using cloud tokens belonging to a different user. the plugins are now locked to a specific scrypted cloud account once paired.
+
+
 ### 0.3.0
 
 alexa/google-home: additional auth token checks to harden endpoints for cloud sharing

plugins/alexa/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/alexa",
-   "version": "0.3.1",
+   "version": "0.3.2",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/alexa",
-         "version": "0.3.1",
+         "version": "0.3.2",
          "dependencies": {
             "axios": "^1.3.4",
             "uuid": "^9.0.0"

plugins/alexa/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/alexa",
-   "version": "0.3.1",
+   "version": "0.3.2",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",
       "prescrypted-setup-project": "scrypted-package-json",

plugins/alexa/src/main.ts

@@ -27,6 +27,7 @@ class AlexaPlugin extends ScryptedDeviceBase implements HttpRequestHandler, Mixi
             json: true
         },
         syncedDevices: {
+            defaultValue: [],
             multiple: true,
             hide: true
         },
@@ -66,7 +67,10 @@ class AlexaPlugin extends ScryptedDeviceBase implements HttpRequestHandler, Mixi
         alexaHandlers.set('Alexa.Authorization/AcceptGrant', this.onAlexaAuthorization);
         alexaHandlers.set('Alexa.Discovery/Discover', this.onDiscoverEndpoints);
 
-        this.start();
+        this.start()
+            .catch(e => {
+                this.console.error('startup failed', e);
+            })
     }
 
     async start() {

plugins/amcrest/.vscode/launch.json

@@ -10,7 +10,7 @@
             "port": 10081,
             "request": "attach",
             "skipFiles": [
-                "**/plugin-remote-worker.*",
+                "**/plugin-console.*",
                 "<node_internals>/**"
             ],
             "preLaunchTask": "scrypted: deploy+debug",

plugins/amcrest/package-lock.json

@@ -1,19 +1,21 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.135",
+   "version": "0.0.151",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/amcrest",
-         "version": "0.0.135",
+         "version": "0.0.151",
          "license": "Apache",
          "dependencies": {
             "@scrypted/common": "file:../../common",
-            "@scrypted/sdk": "file:../../sdk"
+            "@scrypted/sdk": "file:../../sdk",
+            "content-type": "^1.0.5"
          },
          "devDependencies": {
-            "@types/node": "^20.10.8"
+            "@types/content-type": "^1.1.8",
+            "@types/node": "^20.11.30"
          }
       },
       "../../common": {
@@ -23,23 +25,22 @@
          "dependencies": {
             "@scrypted/sdk": "file:../sdk",
             "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
+            "http-auth-utils": "^5.0.1",
             "typescript": "^5.3.3"
          },
          "devDependencies": {
-            "@types/node": "^20.10.8",
+            "@types/node": "^20.11.0",
             "ts-node": "^10.9.2"
          }
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.3.4",
+         "version": "0.3.29",
          "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",
@@ -77,15 +78,29 @@
          "resolved": "../../sdk",
          "link": true
       },
+      "node_modules/@types/content-type": {
+         "version": "1.1.8",
+         "resolved": "https://registry.npmjs.org/@types/content-type/-/content-type-1.1.8.tgz",
+         "integrity": "sha512-1tBhmVUeso3+ahfyaKluXe38p+94lovUZdoVfQ3OnJo9uJC42JT7CBoN3k9HYhAae+GwiBYmHu+N9FZhOG+2Pg==",
+         "dev": true
+      },
       "node_modules/@types/node": {
-         "version": "20.10.8",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.8.tgz",
-         "integrity": "sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==",
+         "version": "20.11.30",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+         "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
          "dev": true,
          "dependencies": {
             "undici-types": "~5.26.4"
          }
       },
+      "node_modules/content-type": {
+         "version": "1.0.5",
+         "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+         "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+         "engines": {
+            "node": ">= 0.6"
+         }
+      },
       "node_modules/undici-types": {
          "version": "5.26.5",
          "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",

plugins/amcrest/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/amcrest",
-   "version": "0.0.135",
+   "version": "0.0.151",
    "description": "Amcrest Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -36,9 +36,11 @@
    },
    "dependencies": {
       "@scrypted/common": "file:../../common",
-      "@scrypted/sdk": "file:../../sdk"
+      "@scrypted/sdk": "file:../../sdk",
+      "content-type": "^1.0.5"
    },
    "devDependencies": {
-      "@types/node": "^20.10.8"
+      "@types/content-type": "^1.1.8",
+      "@types/node": "^20.11.30"
    }
 }

plugins/amcrest/src/amcrest-api.ts

@@ -1,10 +1,140 @@
 import { AuthFetchCredentialState, HttpFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
-import { Readable } from 'stream';
+import { readLine } from '@scrypted/common/src/read-stream';
+import { parseHeaders, readBody } from '@scrypted/common/src/rtsp-server';
+import contentType from 'content-type';
+import { IncomingMessage } from 'http';
+import { EventEmitter, Readable } from 'stream';
+import { Destroyable } from '../../rtsp/src/rtsp';
 import { getDeviceInfo } from './probe';
+import { Point } from '@scrypted/sdk';
+
+// Human
+// {
+//     "Action" : "Cross",
+//     "Class" : "Normal",
+//     "CountInGroup" : 1,
+//     "DetectRegion" : [
+//        [ 455, 260 ],
+//        [ 3586, 260 ],
+//        [ 3768, 7580 ],
+//        [ 382, 7451 ]
+//     ],
+//     "Direction" : "Enter",
+//     "EventID" : 10181,
+//     "GroupID" : 0,
+//     "Name" : "Rule1",
+//     "Object" : {
+//        "Action" : "Appear",
+//        "BoundingBox" : [ 2856, 1280, 3880, 4880 ],
+//        "Center" : [ 3368, 3080 ],
+//        "Confidence" : 0,
+//        "LowerBodyColor" : [ 0, 0, 0, 0 ],
+//        "MainColor" : [ 0, 0, 0, 0 ],
+//        "ObjectID" : 863,
+//        "ObjectType" : "Human",
+//        "RelativeID" : 0,
+//        "Speed" : 0
+//     },
+//     "PTS" : 43380319830.0,
+//     "RuleID" : 2,
+//     "Track" : [],
+//     "UTC" : 1711446999,
+//     "UTCMS" : 701
+//  }
+
+// Face
+// {
+//     "CfgRuleId" : 1,
+//     "Class" : "FaceDetection",
+//     "CountInGroup" : 2,
+//     "DetectRegion" : null,
+//     "EventID" : 10360,
+//     "EventSeq" : 6,
+//     "Faces" : [
+//        {
+//           "BoundingBox" : [ 1504, 2336, 1728, 2704 ],
+//           "Center" : [ 1616, 2520 ],
+//           "ObjectID" : 94,
+//           "ObjectType" : "HumanFace",
+//           "RelativeID" : 0
+//        }
+//     ],
+//     "FrameSequence" : 8251212,
+//     "GroupID" : 6,
+//     "Mark" : 0,
+//     "Name" : "FaceDetection",
+//     "Object" : {
+//        "Action" : "Appear",
+//        "BoundingBox" : [ 1504, 2336, 1728, 2704 ],
+//        "Center" : [ 1616, 2520 ],
+//        "Confidence" : 19,
+//        "FrameSequence" : 8251212,
+//        "ObjectID" : 94,
+//        "ObjectType" : "HumanFace",
+//        "RelativeID" : 0,
+//        "SerialUUID" : "",
+//        "Source" : 0.0,
+//        "Speed" : 0,
+//        "SpeedTypeInternal" : 0
+//     },
+//     "Objects" : [
+//        {
+//           "Action" : "Appear",
+//           "BoundingBox" : [ 1504, 2336, 1728, 2704 ],
+//           "Center" : [ 1616, 2520 ],
+//           "Confidence" : 19,
+//           "FrameSequence" : 8251212,
+//           "ObjectID" : 94,
+//           "ObjectType" : "HumanFace",
+//           "RelativeID" : 0,
+//           "SerialUUID" : "",
+//           "Source" : 0.0,
+//           "Speed" : 0,
+//           "SpeedTypeInternal" : 0
+//        }
+//     ],
+//     "PTS" : 43774941350.0,
+//     "Priority" : 0,
+//     "RuleID" : 1,
+//     "RuleId" : 1,
+//     "Source" : -1280470024.0,
+//     "UTC" : 947510337,
+//     "UTCMS" : 0
+//  }
+export interface AmcrestObjectDetails {
+    Action: string;
+    BoundingBox: Point;
+    Center: Point;
+    Confidence: number;
+    LowerBodyColor: [number, number, number, number];
+    MainColor: [number, number, number, number];
+    ObjectID: number;
+    ObjectType: string;
+    RelativeID: number;
+    Speed: number;
+}
+
+export interface AmcrestEventData {
+    Action: string;
+    Class: string;
+    CountInGroup: number;
+    DetectRegion: Point[];
+    Direction: string;
+    EventID: number;
+    GroupID: number;
+    Name: string;
+    Object: AmcrestObjectDetails;
+    PTS: number;
+    RuleID: number;
+    Track: any[];
+    UTC: number;
+    UTCMS: number;
+}
 
 export enum AmcrestEvent {
     MotionStart = "Code=VideoMotion;action=Start",
     MotionStop = "Code=VideoMotion;action=Stop",
+    MotionInfo = "Code=VideoMotionInfo;action=State",
     AudioStart = "Code=AudioMutation;action=Start",
     AudioStop = "Code=AudioMutation;action=Stop",
     TalkInvite = "Code=_DoTalkAction_;action=Invite",
@@ -18,8 +148,33 @@ export enum AmcrestEvent {
     DahuaTalkHangup = "Code=PassiveHungup;action=Start",
     DahuaCallDeny = "Code=HungupPhone;action=Pulse",
     DahuaTalkPulse = "Code=_CallNoAnswer_;action=Pulse",
+    FaceDetection = "Code=FaceDetection;action=Start",
+    SmartMotionHuman = "Code=SmartMotionHuman;action=Start",
+    SmartMotionVehicle = "Code=Vehicle;action=Start",
+    CrossLineDetection = "Code=CrossLineDetection;action=Start",
+    CrossRegionDetection = "Code=CrossRegionDetection;action=Start",
 }
 
+
+async function readAmcrestMessage(client: Readable): Promise<string[]> {
+    let currentHeaders: string[] = [];
+    while (true) {
+        const originalLine = await readLine(client);
+        const line = originalLine.trim();
+        if (!line)
+            return currentHeaders;
+        // dahua bugs out and sends message without a newline separating the body:
+        // Content-Length:39
+        // Code=AudioMutation;action=Start;index=0
+        if (!line.includes(':')) {
+            client.unshift(Buffer.from(originalLine + '\n'));
+            return currentHeaders;
+        }
+        currentHeaders.push(line);
+    }
+}
+
+
 export class AmcrestCameraClient {
     credential: AuthFetchCredentialState;
 
@@ -78,7 +233,8 @@ export class AmcrestCameraClient {
         return response.body;
     }
 
-    async listenEvents() {
+    async listenEvents(): Promise<Destroyable> {
+        const events = new EventEmitter();
         const url = `http://${this.ip}/cgi-bin/eventManager.cgi?action=attach&codes=[All]`;
         console.log('preparing event listener', url);
 
@@ -86,32 +242,119 @@ export class AmcrestCameraClient {
             url,
             responseType: 'readable',
         });
-        const stream = response.body;
+        const stream: IncomingMessage = response.body;
+        (events as any).destroy = () => {
+            stream.destroy();
+            events.removeAllListeners();
+        };
+        stream.on('close', () => {
+            events.emit('close');
+        });
+        stream.on('end', () => {
+            events.emit('end');
+        });
+        stream.on('error', e => {
+            events.emit('error', e);
+        });
         stream.socket.setKeepAlive(true);
 
-        stream.on('data', (buffer: Buffer) => {
-            const data = buffer.toString();
-            const parts = data.split(';');
-            let index: string;
-            try {
-                for (const part of parts) {
-                    if (part.startsWith('index')) {
-                        index = part.split('=')[1]?.trim();
+
+        const ct = stream.headers['content-type'];
+        // 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}--`;
+
+
+        (async () => {
+            while (true) {
+                let ignore = await readLine(stream);
+                ignore = ignore.trim();
+                if (!ignore)
+                    continue;
+                if (ignore === boundaryEnd)
+                    continue;
+                // dahua bugs out and sends this.
+                if (ignore === 'HTTP/1.1 200 OK') {
+                    const message = await readAmcrestMessage(stream);
+                    this.console.log('ignoring dahua http message', message);
+                    message.unshift('');
+                    const headers = parseHeaders(message);
+                    const body = await readBody(stream, headers);
+                    if (body)
+                        this.console.log('ignoring dahua http body', body);
+                    continue;
+                }
+                if (ignore !== boundary && ignore !== altBoundary) {
+                    this.console.error('expected boundary but found', ignore);
+                    this.console.error(response.headers);
+                    throw new Error('expected boundary');
+                }
+
+                const message = await readAmcrestMessage(stream);
+                events.emit('data', message);
+                message.unshift('');
+                const headers = parseHeaders(message);
+                const body = await readBody(stream, headers);
+
+                const data = body.toString();
+                events.emit('data', data);
+
+                const parts = data.split(';');
+                let index: string;
+                try {
+                    for (const part of parts) {
+                        if (part.startsWith('index')) {
+                            index = part.split('=')[1]?.trim();
+                        }
+                    }
+                }
+                catch (e) {
+                    this.console.error('error parsing index', data);
+                }
+                let jsonData: any;
+                try {
+                    for (const part of parts) {
+                        if (part.startsWith('data')) {
+                            jsonData = JSON.parse(part.split('=')[1]?.trim());
+                        }
+                    }
+                }
+                catch (e) {
+                    this.console.error('error parsing data', data);
+                }
+
+                for (const event of Object.values(AmcrestEvent)) {
+                    if (data.indexOf(event) !== -1) {
+                        events.emit('event', event, index, data);
+
+                        if (event === AmcrestEvent.SmartMotionHuman) {
+                            events.emit('smart', 'person', jsonData);
+                        }
+                        else if (event === AmcrestEvent.SmartMotionVehicle) {
+                            events.emit('smart', 'car', jsonData);
+                        }
+                        else if (event === AmcrestEvent.FaceDetection) {
+                            events.emit('smart', 'face', jsonData);
+                        }
+                        else if (event === AmcrestEvent.CrossLineDetection || event === AmcrestEvent.CrossRegionDetection) {
+                            const eventData: AmcrestEventData = jsonData;
+                            if (eventData?.Object?.ObjectType === 'Human') {
+                                events.emit('smart', 'person', eventData);
+                            }
+                            else if (eventData?.Object?.ObjectType === 'Vehicle') {
+                                events.emit('smart', 'car', eventData);
+                            }
+                        }
                     }
                 }
             }
-            catch (e) {
-                this.console.error('error parsing index', data);
-            }
-            // this.console?.log('event', data);
-            for (const event of Object.values(AmcrestEvent)) {
-                if (data.indexOf(event) !== -1) {
-                    stream.emit('event', event, index, data);
-                }
-            }
-        });
-
-        return stream;
+        })()
+            .catch(() => stream.destroy());
+        return events as any as Destroyable;
     }
 
     async enableContinousRecording(channel: number) {

plugins/amcrest/src/main.ts

@@ -1,11 +1,11 @@
 import { ffmpegLogInitialOutput } from '@scrypted/common/src/media-helpers';
 import { readLength } from "@scrypted/common/src/read-stream";
-import sdk, { Camera, DeviceCreatorSettings, DeviceInformation, FFmpegInput, Intercom, Lock, MediaObject, MediaStreamOptions, Reboot, RequestPictureOptions, RequestRecordingStreamOptions, ResponseMediaStreamOptions, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting, VideoCameraConfiguration, VideoRecorder } from "@scrypted/sdk";
+import sdk, { Camera, DeviceCreatorSettings, DeviceInformation, FFmpegInput, Intercom, Lock, MediaObject, MediaStreamOptions, ObjectDetectionTypes, ObjectDetector, ObjectsDetected, Reboot, RequestPictureOptions, RequestRecordingStreamOptions, ResponseMediaStreamOptions, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting, VideoCameraConfiguration, VideoRecorder } from "@scrypted/sdk";
 import child_process, { ChildProcess } from 'child_process';
 import { PassThrough, Readable, Stream } from "stream";
 import { OnvifIntercom } from "../../onvif/src/onvif-intercom";
 import { RtspProvider, RtspSmartCamera, UrlMediaStreamOptions } from "../../rtsp/src/rtsp";
-import { AmcrestCameraClient, AmcrestEvent } from "./amcrest-api";
+import { AmcrestCameraClient, AmcrestEvent, AmcrestEventData } from "./amcrest-api";
 
 const { mediaManager } = sdk;
 
@@ -22,12 +22,13 @@ function findValue(blob: string, prefix: string, key: string) {
     return parts[1];
 }
 
-class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration, Camera, Intercom, Lock, VideoRecorder, Reboot {
+class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration, Camera, Intercom, Lock, VideoRecorder, Reboot, ObjectDetector {
     eventStream: Stream;
     cp: ChildProcess;
     client: AmcrestCameraClient;
     videoStreamOptions: Promise<UrlMediaStreamOptions[]>;
     onvifIntercom = new OnvifIntercom(this);
+    hasSmartDetection: boolean;
 
     constructor(nativeId: string, provider: RtspProvider) {
         super(nativeId, provider);
@@ -36,6 +37,7 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
             this.storage.removeItem('amcrestDoorbell');
         }
 
+        this.hasSmartDetection = this.storage.getItem('hasSmartDetection') === 'true';
         this.updateDevice();
         this.updateDeviceInfo();
     }
@@ -184,10 +186,19 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
                 if (idx.toString() !== channelNumber)
                     return;
             }
-            if (event === AmcrestEvent.MotionStart) {
+            if (event === AmcrestEvent.MotionStart
+                || event === AmcrestEvent.SmartMotionHuman
+                || event === AmcrestEvent.SmartMotionVehicle
+                || event === AmcrestEvent.CrossLineDetection
+                || event === AmcrestEvent.CrossRegionDetection) {
                 this.motionDetected = true;
                 resetMotionTimeout();
             }
+            else if (event === AmcrestEvent.MotionInfo) {
+                // this seems to be a motion pulse
+                if (this.motionDetected)
+                    resetMotionTimeout();
+            }
             else if (event === AmcrestEvent.MotionStop) {
                 // use resetMotionTimeout
             }
@@ -231,9 +242,43 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
             }
         });
 
+        events.on('smart', (className: string, data: AmcrestEventData) => {
+            if (!this.hasSmartDetection) {
+                this.hasSmartDetection = true;
+                this.storage.setItem('hasSmartDetection', 'true');
+                this.updateDevice();
+            }
+
+            const detected: ObjectsDetected = {
+                timestamp: Date.now(),
+                detections: [
+                    {
+                        score: 1,
+                        className,
+                    }
+                ],
+            };
+
+            this.onDeviceEvent(ScryptedInterface.ObjectDetector, detected);
+        });
+
         return events;
     }
 
+    async getDetectionInput(detectionId: string, eventId?: any): Promise<MediaObject> {
+        return;
+    }
+
+    async getObjectTypes(): Promise<ObjectDetectionTypes> {
+        return {
+            classes: [
+                'person',
+                'face',
+                'car',
+            ],
+        }
+    }
+
     async getOtherSettings(): Promise<Setting[]> {
         const ret = await super.getOtherSettings();
         ret.push(
@@ -472,13 +517,19 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
         if (isDoorbell || twoWayAudio) {
             interfaces.push(ScryptedInterface.Intercom);
         }
+
         const enableDahuaLock = this.storage.getItem('enableDahuaLock') === 'true';
         if (isDoorbell && doorbellType === DAHUA_DOORBELL_TYPE && enableDahuaLock) {
             interfaces.push(ScryptedInterface.Lock);
         }
+
         const continuousRecording = this.storage.getItem('continuousRecording') === 'true';
         if (continuousRecording)
             interfaces.push(ScryptedInterface.VideoRecorder);
+
+        if (this.hasSmartDetection)
+            interfaces.push(ScryptedInterface.ObjectDetector);
+
         this.provider.updateDevice(this.nativeId, this.name, interfaces, type);
     }
 
@@ -521,7 +572,7 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
         }
 
         const doorbellType = this.storage.getItem('doorbellType');
-        
+
         // not sure if this all works, since i don't actually have a doorbell.
         // good luck!
         const channel = this.getRtspChannel() || '1';
@@ -548,12 +599,22 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
         }
         else {
             args.push(
-                      "-vn",
-                      '-acodec', 'aac',
-                      '-f', 'adts',
-                      'pipe:3',
-                      );
+                "-vn",
+                '-acodec', 'aac',
+                '-f', 'adts',
+                'pipe:3',
+            );
             contentType = 'Audio/AAC';
+            // args.push(
+            //     "-vn",
+            //     '-acodec', 'pcm_mulaw',
+            //     '-ac', '1',
+            //     '-ar', '8000',
+            //     '-sample_fmt', 's16',
+            //     '-f', 'mulaw',
+            //     'pipe:3',
+            // );
+            // contentType = 'Audio/G.711A';
         }
 
         this.console.log('ffmpeg intercom', args);
@@ -573,15 +634,19 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
             // seems the dahua doorbells preferred 1024 chunks. should investigate adts
             // parsing and sending multipart chunks instead.
             const passthrough = new PassThrough();
+            const abortController = new AbortController();
             this.getClient().request({
                 url,
                 method: 'POST',
                 headers: {
                     'Content-Type': contentType,
-                    'Content-Length': '9999999'
+                    'Content-Length': '9999999',
                 },
+                signal: abortController.signal,
                 responseType: 'readable',
-            }, passthrough);
+            }, passthrough)
+                .catch(() => { })
+                .finally(() => this.console.log('request finished'))
 
             try {
                 while (true) {
@@ -593,7 +658,8 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
             }
             finally {
                 this.console.log('audio finished');
-                passthrough.end();
+                passthrough.destroy();
+                abortController.abort();
             }
 
             this.stopIntercom();

plugins/amcrest/src/probe.ts

@@ -29,9 +29,14 @@ export async function getDeviceInfo(credential: AuthFetchCredentialState, addres
         vals[k] = v.trim();
     }
 
-    return {
+    const ret = {
         deviceType: vals.deviceType,
         hardwareVersion: vals.hardwareVersion,
         serialNumber: vals.serialNumber,
-    }
+    };
+
+    if (!ret.deviceType && !ret.hardwareVersion && !ret.serialNumber)
+        throw new Error('not amcrest');
+
+    return ret;
 }

plugins/bticino/package-lock.json

@@ -1,52 +1,48 @@
 {
    "name": "@scrypted/bticino",
-   "version": "0.0.13",
+   "version": "0.0.16",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/bticino",
-         "version": "0.0.13",
+         "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",
          "dependencies": {
             "@scrypted/sdk": "file:../sdk",
             "@scrypted/server": "file:../server",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "http-auth-utils": "^5.0.1",
+            "typescript": "^5.3.3"
          },
          "devDependencies": {
-            "@types/node": "^16.9.0"
+            "@types/node": "^20.11.0",
+            "ts-node": "^10.9.2"
          }
       },
       "../../sdk": {
-         "name": "@scrypted/sdk",
-         "version": "0.3.2",
+         "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",
@@ -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": {
@@ -1219,10 +1303,10 @@
          "requires": {
             "@scrypted/sdk": "file:../sdk",
             "@scrypted/server": "file:../server",
-            "@types/node": "^16.9.0",
-            "http-auth-utils": "^3.0.2",
-            "node-fetch-commonjs": "^3.1.1",
-            "typescript": "^4.4.3"
+            "@types/node": "^20.11.0",
+            "http-auth-utils": "^5.0.1",
+            "ts-node": "^10.9.2",
+            "typescript": "^5.3.3"
          }
       },
       "@scrypted/sdk": {
@@ -1232,7 +1316,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",
@@ -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",

plugins/bticino/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/bticino",
-   "version": "0.0.13",
+   "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"
    }

plugins/bticino/src/bticino-camera.ts

@@ -1,22 +1,28 @@
-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';
+import { default as stream } from 'node:stream'
+import type { ReadableStream } from 'node:stream/web'
+import { finished } from "stream/promises";
 
 import { get } from 'http'
 import { ControllerApi } from './c300x-controller-api';
@@ -25,13 +31,13 @@ import { BticinoMuteSwitch } from './bticino-mute-switch';
 
 const STREAM_TIMEOUT = 65000;
 const { mediaManager } = sdk;
+const BTICINO_CLIPS = path.join(process.env.SCRYPTED_PLUGIN_VOLUME, 'bticino-clips');
 
 export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor, DeviceProvider, Intercom, Camera, VideoCamera, Settings, BinarySensor, HttpRequestHandler, VideoClips, Reboot {
 
     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
@@ -147,11 +153,87 @@ export class BticinoSipCamera extends ScryptedDeviceBase implements MotionSensor
         });
     }
 
-    getVideoClip(videoId: string): Promise<MediaObject> {
-        let c300x = SipHelper.getIntercomIp(this)
-        const url = `http://${c300x}:8080/voicemail?msg=${videoId}/aswm.avi&raw=true`;
-        return mediaManager.createMediaObjectFromUrl(url);        
+    async getVideoClip(videoId: string): Promise<MediaObject> {
+        const outputfile = await this.fetchAndConvertVoicemailMessage(videoId);
+
+        const fileURLToPath: string = url.pathToFileURL(outputfile).toString()
+        this.console.log(`Creating mediaObject for url: ${fileURLToPath}`)
+        return await mediaManager.createMediaObjectFromUrl(fileURLToPath);
     }
+
+    private async fetchAndConvertVoicemailMessage(videoId: string) {
+        let c300x = SipHelper.getIntercomIp(this)
+
+        const response = await fetch(`http://${c300x}:8080/voicemail?msg=${videoId}/aswm.avi&raw=true`);
+
+        const contentLength: number = Number(response.headers.get("Content-Length"));
+        const lastModified: Date = new Date(response.headers.get("Last-Modified-Time"));
+
+        const avifile = `${BTICINO_CLIPS}/${videoId}.avi`;
+        const outputfile = `${BTICINO_CLIPS}/${videoId}.mp4`;
+
+        if (!fs.existsSync(BTICINO_CLIPS)) {
+            this.console.log(`Creating clips dir at: ${BTICINO_CLIPS}`)
+            fs.mkdirSync(BTICINO_CLIPS);
+        }
+
+        if (fs.existsSync(avifile)) {
+            const stat = fs.statSync(avifile);
+            if (stat.size != contentLength || stat.mtime.getTime() != lastModified.getTime()) {
+                this.console.log(`Size ${stat.size} != ${contentLength} or time ${stat.mtime.getTime} != ${lastModified.getTime}`)
+                try {
+                    fs.rmSync(avifile);
+                } catch (e) { }
+                try {
+                    fs.rmSync(outputfile);
+                } catch (e) { }
+            } else {
+                this.console.log(`Keeping the cached video at ${avifile}`)
+            }
+        }
+
+        if (!fs.existsSync(avifile)) {
+            this.console.log("Starting download.")
+            await finished(stream.Readable.from(response.body as ReadableStream<Uint8Array>).pipe(fs.createWriteStream(avifile)));
+            this.console.log("Download finished.")
+            try {
+                this.console.log(`Setting mtime to ${lastModified}`)
+                fs.utimesSync(avifile, lastModified, lastModified);
+            } catch (e) { }
+        }
+
+        const ffmpegPath = await mediaManager.getFFmpegPath();
+        const ffmpegArgs = [
+            '-hide_banner',
+            '-nostats',
+            '-y',
+            '-i', avifile,
+            outputfile
+        ];
+
+        safePrintFFmpegArguments(console, ffmpegArgs);
+        const cp = child_process.spawn(ffmpegPath, ffmpegArgs, {
+            stdio: ['pipe', 'pipe', 'pipe', 'pipe'],
+        });
+
+        const p = new Promise((resolveFunc) => {
+            cp.stdout.on("data", (x) => {
+                this.console.log(x.toString());
+            });
+            cp.stderr.on("data", (x) => {
+                this.console.error(x.toString());
+            });
+            cp.on("exit", (code) => {
+                resolveFunc(code);
+            });
+        });
+
+        let returnCode = await p;
+
+        this.console.log(`Converted file returned code: ${returnCode}`);
+        return outputfile;
+    }
+
     getVideoClipThumbnail(thumbnailId: string): Promise<MediaObject> {
         let c300x = SipHelper.getIntercomIp(this)
         const url = `http://${c300x}:8080/voicemail?msg=${thumbnailId}/aswm.jpg&raw=true`;
@@ -193,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[]> {
@@ -234,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() {
@@ -489,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

plugins/bticino/src/bticino-voicemailHandler.ts

@@ -33,8 +33,10 @@ export class VoicemailHandler extends SipRequestHandler {
     handle(request: SipRequest) {
         const lastVoicemailMessageTimestamp : number = Number.parseInt( this.sipCamera.storage.getItem('lastVoicemailMessageTimestamp') ) || -1
         const message : string = request.content.toString()
-        if( message.startsWith('*#8**40*0*0*') || message.startsWith('*#8**40*1*0*') ) {
-            this.aswmIsEnabled = message.startsWith('*#8**40*1*0*');
+        let matches : Array<RegExpMatchArray> = [...message.matchAll(/\*#8\*\*40\*([01])\*([01])\*/gm)]
+        if( matches && matches.length > 0 && matches[0].length > 0 ) {
+            this.sipCamera.console.debug(  "Answering machine state: " + matches[0][1] + " / Welcome message state: " + matches[0][2] );
+            this.aswmIsEnabled = matches[0][1] == '1';
             if( this.isEnabled() ) {
                 this.sipCamera.console.debug("Handling incoming answering machine reply")
                 const messages : string[] = message.split(';')
@@ -60,6 +62,8 @@ export class VoicemailHandler extends SipRequestHandler {
                     this.sipCamera.console.debug("No new messages since: " + lastVoicemailMessageTimestamp + " lastMessage: " + lastMessageTimestamp)
                 }
             }
+        } else {
+            this.sipCamera.console.debug("Not handling message: " + message)
         }
     }
 

plugins/chromecast/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/chromecast",
-   "version": "0.1.57",
+   "version": "0.1.58",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/chromecast",
-         "version": "0.1.57",
+         "version": "0.1.58",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",

plugins/chromecast/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/chromecast",
-   "version": "0.1.57",
+   "version": "0.1.58",
    "description": "Send video, audio, and text to speech notifications to Chromecast and Google Home devices",
    "author": "Scrypted",
    "license": "Apache-2.0",

plugins/chromecast/src/main.ts

@@ -183,7 +183,7 @@ class CastDevice extends ScryptedDeviceBase implements MediaPlayer, Refresh, Eng
         media = await mediaManager.createMediaObjectFromUrl(media);
       }
     }
-    else if (options?.mimeType?.startsWith('image/')) {
+    else if (options?.mimeType?.startsWith('image/') || options?.mimeType?.startsWith('audio/')) {
       url = await mediaManager.convertMediaObjectToInsecureLocalUrl(media, options?.mimeType);
     }
 

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

plugins/core/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/core",
-   "version": "0.3.18",
+   "version": "0.3.26",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/core",
-         "version": "0.3.18",
+         "version": "0.3.26",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",

plugins/core/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/core",
-   "version": "0.3.18",
+   "version": "0.3.26",
    "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
    "author": "Scrypted",
    "license": "Apache-2.0",

plugins/core/src/main.ts

@@ -18,7 +18,7 @@ const { systemManager, deviceManager, endpointManager } = sdk;
 export function getAddresses() {
     const addresses: string[] = [];
     for (const [iface, nif] of Object.entries(os.networkInterfaces())) {
-        if (iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan')) {
+        if (iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan') || iface.startsWith('net')) {
             addresses.push(iface);
             addresses.push(...nif.map(addr => addr.address));
         }

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';
 
@@ -11,7 +12,7 @@ export async function checkLxcDependencies() {
 
     let needRestart = false;
     if (!process.version.startsWith('v20.')) {
-        const cp = child_process.spawn('sh', ['-c', 'curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt install -y nodejs']);
+        const cp = child_process.spawn('sh', ['-c', 'apt update -y && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - && apt install -y nodejs']);
         const [exitCode] = await once(cp, 'exit');
         if (exitCode !== 0)
             sdk.log.a('Failed to install Node.js 20.x.');
@@ -41,6 +42,31 @@ 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 (output.includes('Version: 23')) {
+            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.');
 }

plugins/core/tsconfig.json

@@ -1,9 +1,9 @@
 {
     "compilerOptions": {
-        "module": "commonjs",
-        "target": "ES2021",
-        "resolveJsonModule": true,
+        "module": "Node16",
         "moduleResolution": "Node16",
+        "target": "esnext",
+        "resolveJsonModule": true,
         "esModuleInterop": true,
         "sourceMap": true
     },

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;

plugins/core/ui/src/interfaces/ObjectDetection.vue

@@ -57,7 +57,10 @@ export default {
                     t += `<tspan x='${x}' dy='${toffset}em'>${Math.round(detection.score * 100) / 100}</tspan>`
                     toffset -= 1.2;
                 }
-                const tname = detection.className + (detection.id ? `: ${detection.id}` : '')
+                const tname = detection.className
+                    + (detection.id || detection.label ? ':' : '')
+                    + (detection.id ? ` ${detection.id}` : '')
+                    + (detection.label ? ` ${detection.label}` : '')
                 t += `<tspan x='${x}' dy='${toffset}em'>${tname}</tspan>`
 
                 const fs = 30 * svgScale;

plugins/coreml/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/coreml",
-   "version": "0.1.29",
+   "version": "0.1.57",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/coreml",
-         "version": "0.1.29",
+         "version": "0.1.57",
          "devDependencies": {
             "@scrypted/sdk": "file:../../sdk"
          }

plugins/coreml/package.json

@@ -34,6 +34,7 @@
       "type": "API",
       "interfaces": [
          "Settings",
+         "DeviceProvider",
          "ObjectDetection",
          "ObjectDetectionPreview"
       ]
@@ -41,5 +42,5 @@
    "devDependencies": {
       "@scrypted/sdk": "file:../../sdk"
    },
-   "version": "0.1.29"
+   "version": "0.1.57"
 }

plugins/coreml/src/common

@@ -0,0 +1 @@
+../../openvino/src/common

plugins/coreml/src/coreml/__init__.py

@@ -1,24 +1,47 @@
 from __future__ import annotations
 
+import ast
 import asyncio
 import concurrent.futures
 import os
 import re
-from typing import Any, Tuple
+from typing import Any, List, Tuple
 
 import coremltools as ct
 import scrypted_sdk
 from PIL import Image
 from scrypted_sdk import Setting, SettingValue
 
-import yolo
-from predict import Prediction, PredictPlugin, Rectangle
+from common import yolo
+from coreml.face_recognition import CoreMLFaceRecognition
 
-predictExecutor = concurrent.futures.ThreadPoolExecutor(8, "CoreML-Predict")
+try:
+    from coreml.text_recognition import CoreMLTextRecognition
+except:
+    CoreMLTextRecognition = None
+from predict import Prediction, PredictPlugin
+from predict.rectangle import Rectangle
+
+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_yolov6n_320",
+    "scrypted_yolov6s_320",
+    "scrypted_yolov8n_320",
+    "ssdlite_mobilenet_v2",
+    "yolov4-tiny",
+]
 
 
 def parse_label_contents(contents: str):
-    lines = contents.splitlines()
+    lines = contents.split(",")
+    lines = [line for line in lines if line.strip()]
     ret = {}
     for row_number, content in enumerate(lines):
         pair = re.split(r"[:\s]+", content.strip(), maxsplit=1)
@@ -29,40 +52,51 @@ def parse_label_contents(contents: str):
     return ret
 
 
-class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Settings):
+def parse_labels(userDefined):
+    yolo = userDefined.get("names") or userDefined.get("yolo.names")
+    if yolo:
+        j = ast.literal_eval(yolo)
+        ret = {}
+        for k, v in j.items():
+            ret[int(k)] = v
+        return ret
+
+    classes = userDefined.get("classes")
+    if not classes:
+        raise Exception("no classes found in model metadata")
+    return parse_label_contents(classes)
+
+
+class CoreMLPlugin(PredictPlugin, 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":
-            model = "yolov8n_320"
+        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.yolov8 = "yolov8" in model
-        self.yolov9 = "yolov9" in model
-        model_version = "v2"
+        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"
+        mlmodel = "model" if self.scrypted_yolo else model
 
         print(f"model: {model}")
 
         if not self.yolo:
             # todo convert these to mlpackage
-            labelsFile = self.downloadFile(
-                f"https://github.com/koush/coreml-models/raw/main/{model}/coco_labels.txt",
-                "coco_labels.txt",
-            )
             modelFile = self.downloadFile(
-                f"https://github.com/koush/coreml-models/raw/main/{model}/{model}.mlmodel",
+                f"https://github.com/koush/coreml-models/raw/main/{model}/{mlmodel}.mlmodel",
                 f"{model}.mlmodel",
             )
         else:
-            if self.yolov8:
-                modelFile = self.downloadFile(
-                    f"https://github.com/koush/coreml-models/raw/main/{model}/{model}.mlmodel",
-                    f"{model}.mlmodel",
-                )
-            elif self.yolov9:
+            if self.scrypted_yolo:
                 files = [
                     f"{model}/{model}.mlpackage/Data/com.apple.CoreML/weights/weight.bin",
-                    f"{model}/{model}.mlpackage/Data/com.apple.CoreML/{model}.mlmodel",
+                    f"{model}/{model}.mlpackage/Data/com.apple.CoreML/{mlmodel}.mlmodel",
                     f"{model}/{model}.mlpackage/Manifest.json",
                 ]
 
@@ -77,7 +111,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
                     f"{model}/{model}.mlpackage/Data/com.apple.CoreML/FeatureDescriptions.json",
                     f"{model}/{model}.mlpackage/Data/com.apple.CoreML/Metadata.json",
                     f"{model}/{model}.mlpackage/Data/com.apple.CoreML/weights/weight.bin",
-                    f"{model}/{model}.mlpackage/Data/com.apple.CoreML/{model}.mlmodel",
+                    f"{model}/{model}.mlpackage/Data/com.apple.CoreML/{mlmodel}.mlmodel",
                     f"{model}/{model}.mlpackage/Manifest.json",
                 ]
 
@@ -88,25 +122,64 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
                     )
                     modelFile = os.path.dirname(p)
 
-            labelsFile = self.downloadFile(
-                f"https://github.com/koush/coreml-models/raw/main/{model}/coco_80cl.txt",
-                f"{model_version}/{model}/coco_80cl.txt",
-            )
-
         self.model = ct.models.MLModel(modelFile)
 
         self.modelspec = self.model.get_spec()
         self.inputdesc = self.modelspec.description.input[0]
         self.inputheight = self.inputdesc.type.imageType.height
         self.inputwidth = self.inputdesc.type.imageType.width
+        self.input_name = self.model.get_spec().description.input[0].name
 
-        labels_contents = open(labelsFile, "r").read()
-        self.labels = parse_label_contents(labels_contents)
-        # csv in mobilenet model
-        # self.modelspec.description.metadata.userDefined['classes']
+        self.labels = parse_labels(self.modelspec.description.metadata.userDefined)
         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": devices,
+                }
+            )
+        except:
+            pass
+
+    async def getDevice(self, nativeId: str) -> Any:
+        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"
         return [
@@ -114,14 +187,7 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
                 "key": "model",
                 "title": "Model",
                 "description": "The detection model used to find objects.",
-                "choices": [
-                    "Default",
-                    "ssdlite_mobilenet_v2",
-                    "yolov4-tiny",
-                    "yolov8n",
-                    "yolov8n_320",
-                    "yolov9c_320",
-                ],
+                "choices": availableModels,
                 "value": model,
             },
         ]
@@ -138,22 +204,34 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
     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)
+        )
+        return out_dicts
+
     async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
         objs = []
 
         # run in executor if this is the plugin loop
         if self.yolo:
-            input_name = "image" if self.yolov8 or self.yolov9 else "input_1"
-            if asyncio.get_event_loop() is self.loop:
-                out_dict = await asyncio.get_event_loop().run_in_executor(
-                    predictExecutor, lambda: self.model.predict({input_name: input})
-                )
-            else:
-                out_dict = self.model.predict({input_name: input})
+            out_dict = await self.queue_batch({self.input_name: input})
 
-            if self.yolov8 or self.yolov9:
+            if self.scrypted_yolov10n:
                 results = list(out_dict.values())[0][0]
-                objs = yolo.parse_yolov8(results)
+                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)
                 ret = self.create_detection_result(objs, src_size, cvss)
                 return ret
 
@@ -187,17 +265,12 @@ class CoreMLPlugin(PredictPlugin, scrypted_sdk.BufferConverter, scrypted_sdk.Set
             ret = self.create_detection_result(objs, src_size, cvss)
             return ret
 
-        if asyncio.get_event_loop() is self.loop:
-            out_dict = await asyncio.get_event_loop().run_in_executor(
-                predictExecutor,
-                lambda: self.model.predict(
-                    {"image": input, "confidenceThreshold": self.minThreshold}
-                ),
-            )
-        else:
-            out_dict = self.model.predict(
+        out_dict = await asyncio.get_event_loop().run_in_executor(
+            predictExecutor,
+            lambda: self.model.predict(
                 {"image": input, "confidenceThreshold": self.minThreshold}
-            )
+            ),
+        )
 
         coordinatesList = out_dict["coordinates"].astype(float)
 

plugins/coreml/src/coreml/face_recognition.py

@@ -0,0 +1,142 @@
+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.face_recognize import FaceRecognizeDetection
+from PIL import Image
+
+
+def euclidean_distance(arr1, arr2):
+    return np.linalg.norm(arr1 - arr2)
+
+
+def cosine_similarity(vector_a, vector_b):
+    dot_product = np.dot(vector_a, vector_b)
+    norm_a = np.linalg.norm(vector_a)
+    norm_b = np.linalg.norm(vector_b)
+    similarity = dot_product / (norm_a * norm_b)
+    return similarity
+
+
+predictExecutor = concurrent.futures.ThreadPoolExecutor(8, "Vision-Predict")
+
+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"
+        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][0]
+            return results
+
+        results = await asyncio.get_event_loop().run_in_executor(
+            self.detectExecutor, lambda: predict()
+        )
+        return results
+
+    async def predictFaceModel(self, input: np.ndarray):
+        def predict():
+            model, inputName = self.faceModel
+            out_dict = model.predict({inputName: input})
+            results = out_dict["var_2167"][0]
+            return results
+        results = await asyncio.get_event_loop().run_in_executor(
+            self.recogExecutor, lambda: predict()
+        )
+        return results
+    
+    # def predictVision(self, input: Image.Image) -> asyncio.Future[list[Prediction]]:
+    #     buffer = input.tobytes()
+    #     myData = NSData.alloc().initWithBytes_length_(buffer, len(buffer))
+
+    #     input_image = (
+    #         Quartz.CIImage.imageWithBitmapData_bytesPerRow_size_format_options_(
+    #             myData,
+    #             4 * input.width,
+    #             NSMakeSize(input.width, input.height),
+    #             Quartz.kCIFormatRGBA8,
+    #             None,
+    #         )
+    #     )
+
+    #     request_handler = Vision.VNImageRequestHandler.alloc().initWithCIImage_options_(
+    #         input_image, None
+    #     )
+
+    #     loop = self.loop
+    #     future = loop.create_future()
+
+    #     def detect_face_handler(request, error):
+    #         observations = request.results()
+    #         if error:
+    #             loop.call_soon_threadsafe(future.set_exception, Exception())
+    #         else:
+    #             objs = []
+    #             for o in observations:
+    #                 confidence = o.confidence()
+    #                 bb = o.boundingBox()
+    #                 origin = bb.origin
+    #                 size = bb.size
+
+    #                 l = origin.x * input.width
+    #                 t = (1 - origin.y - size.height) * input.height
+    #                 w = size.width * input.width
+    #                 h = size.height * input.height
+    #                 prediction = Prediction(
+    #                     0, confidence, from_bounding_box((l, t, w, h))
+    #                 )
+    #                 objs.append(prediction)
+
+    #             loop.call_soon_threadsafe(future.set_result, objs)
+
+    #     request = (
+    #         Vision.VNDetectFaceRectanglesRequest.alloc().initWithCompletionHandler_(
+    #             detect_face_handler
+    #         )
+    #     )
+
+    #     error = request_handler.performRequests_error_([request], None)
+    #     return future
+
+    # async def detect_once(self, input: Image.Image, settings: Any, src_size, cvss):
+    #     future = await asyncio.get_event_loop().run_in_executor(
+    #         predictExecutor,
+    #         lambda: self.predictVision(input),
+    #     )
+
+    #     objs = await future
+    #     ret = self.create_detection_result(objs, src_size, cvss)
+    #     return ret

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 = "v7"
+        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

plugins/coreml/src/requirements.optional.txt

@@ -0,0 +1 @@
+opencv-python==4.9.0.80

plugins/coreml/src/requirements.txt

@@ -1,6 +1,2 @@
-#
 coremltools==7.1
-
-# pillow for anything not intel linux, pillow-simd is available on x64 linux
-Pillow>=5.4.1; sys_platform != 'linux' or platform_machine != 'x86_64'
-pillow-simd; sys_platform == 'linux' and platform_machine == 'x86_64'
+Pillow>=5.4.1

plugins/coreml/src/yolo

@@ -1 +0,0 @@
-../../openvino/src/yolo

plugins/dlib/README.md

@@ -1,3 +0,0 @@
-# Dlib Face Recognition for Scrypted
-
-This plugin adds face recognition capabilities to any camera in Scrypted.

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)

plugins/dlib/src/main.py

@@ -1,4 +0,0 @@
-from dlibplugin import DlibPlugin
-
-def create_scrypted_plugin():
-    return DlibPlugin()

plugins/dlib/src/pipeline

@@ -1 +0,0 @@
-../../tensorflow-lite/src/pipeline

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

plugins/hikvision/package-lock.json

@@ -1,22 +1,23 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.137",
+   "version": "0.0.147",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/hikvision",
-         "version": "0.0.137",
+         "version": "0.0.147",
          "license": "Apache",
          "dependencies": {
             "@scrypted/common": "file:../../common",
             "@scrypted/sdk": "file:../../sdk",
-            "@types/xml2js": "^0.4.11",
-            "lodash": "^4.17.21",
-            "xml2js": "^0.6.0"
+            "@types/xml2js": "^0.4.14",
+            "content-type": "^1.0.5",
+            "xml2js": "^0.6.2"
          },
          "devDependencies": {
-            "@types/node": "^18.15.11"
+            "@types/content-type": "^1.1.8",
+            "@types/node": "^20.11.30"
          }
       },
       "../../common": {
@@ -27,17 +28,16 @@
             "@scrypted/sdk": "file:../sdk",
             "@scrypted/server": "file:../server",
             "http-auth-utils": "^5.0.1",
-            "node-fetch-commonjs": "^3.1.1",
             "typescript": "^5.3.3"
          },
          "devDependencies": {
-            "@types/node": "^20.10.8",
+            "@types/node": "^20.11.0",
             "ts-node": "^10.9.2"
          }
       },
       "../../sdk": {
          "name": "@scrypted/sdk",
-         "version": "0.3.4",
+         "version": "0.3.29",
          "license": "ISC",
          "dependencies": {
             "@babel/preset-typescript": "^7.18.6",
@@ -83,33 +83,50 @@
          "resolved": "../../sdk",
          "link": true
       },
+      "node_modules/@types/content-type": {
+         "version": "1.1.8",
+         "resolved": "https://registry.npmjs.org/@types/content-type/-/content-type-1.1.8.tgz",
+         "integrity": "sha512-1tBhmVUeso3+ahfyaKluXe38p+94lovUZdoVfQ3OnJo9uJC42JT7CBoN3k9HYhAae+GwiBYmHu+N9FZhOG+2Pg==",
+         "dev": true
+      },
       "node_modules/@types/node": {
-         "version": "18.15.11",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-         "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
+         "version": "20.11.30",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+         "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+         "dependencies": {
+            "undici-types": "~5.26.4"
+         }
       },
       "node_modules/@types/xml2js": {
-         "version": "0.4.11",
-         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.11.tgz",
-         "integrity": "sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==",
+         "version": "0.4.14",
+         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.14.tgz",
+         "integrity": "sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==",
          "dependencies": {
             "@types/node": "*"
          }
       },
-      "node_modules/lodash": {
-         "version": "4.17.21",
-         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-         "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "node_modules/content-type": {
+         "version": "1.0.5",
+         "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+         "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+         "engines": {
+            "node": ">= 0.6"
+         }
       },
       "node_modules/sax": {
          "version": "1.2.4",
          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
       },
+      "node_modules/undici-types": {
+         "version": "5.26.5",
+         "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+         "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      },
       "node_modules/xml2js": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
-         "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
+         "version": "0.6.2",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+         "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
          "dependencies": {
             "sax": ">=0.6.0",
             "xmlbuilder": "~11.0.0"
@@ -133,9 +150,8 @@
          "requires": {
             "@scrypted/sdk": "file:../sdk",
             "@scrypted/server": "file:../server",
-            "@types/node": "^20.10.8",
+            "@types/node": "^20.11.0",
             "http-auth-utils": "^5.0.1",
-            "node-fetch-commonjs": "^3.1.1",
             "ts-node": "^10.9.2",
             "typescript": "^5.3.3"
          }
@@ -164,33 +180,47 @@
             "webpack-bundle-analyzer": "^4.5.0"
          }
       },
+      "@types/content-type": {
+         "version": "1.1.8",
+         "resolved": "https://registry.npmjs.org/@types/content-type/-/content-type-1.1.8.tgz",
+         "integrity": "sha512-1tBhmVUeso3+ahfyaKluXe38p+94lovUZdoVfQ3OnJo9uJC42JT7CBoN3k9HYhAae+GwiBYmHu+N9FZhOG+2Pg==",
+         "dev": true
+      },
       "@types/node": {
-         "version": "18.15.11",
-         "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.11.tgz",
-         "integrity": "sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q=="
+         "version": "20.11.30",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+         "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+         "requires": {
+            "undici-types": "~5.26.4"
+         }
       },
       "@types/xml2js": {
-         "version": "0.4.11",
-         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.11.tgz",
-         "integrity": "sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==",
+         "version": "0.4.14",
+         "resolved": "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.14.tgz",
+         "integrity": "sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==",
          "requires": {
             "@types/node": "*"
          }
       },
-      "lodash": {
-         "version": "4.17.21",
-         "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-         "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "content-type": {
+         "version": "1.0.5",
+         "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+         "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA=="
       },
       "sax": {
          "version": "1.2.4",
          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
          "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
       },
+      "undici-types": {
+         "version": "5.26.5",
+         "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+         "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      },
       "xml2js": {
-         "version": "0.6.0",
-         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
-         "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
+         "version": "0.6.2",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz",
+         "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==",
          "requires": {
             "sax": ">=0.6.0",
             "xmlbuilder": "~11.0.0"

plugins/hikvision/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/hikvision",
-   "version": "0.0.137",
+   "version": "0.0.147",
    "description": "Hikvision Plugin for Scrypted",
    "author": "Scrypted",
    "license": "Apache",
@@ -37,11 +37,12 @@
    "dependencies": {
       "@scrypted/common": "file:../../common",
       "@scrypted/sdk": "file:../../sdk",
-      "@types/xml2js": "^0.4.11",
-      "lodash": "^4.17.21",
-      "xml2js": "^0.6.0"
+      "@types/xml2js": "^0.4.14",
+      "content-type": "^1.0.5",
+      "xml2js": "^0.6.2"
    },
    "devDependencies": {
-      "@types/node": "^18.15.11"
+      "@types/content-type": "^1.1.8",
+      "@types/node": "^20.11.30"
    }
 }

plugins/hikvision/src/hikvision-camera-api.ts

@@ -1,8 +1,17 @@
 import { AuthFetchCredentialState, HttpFetchOptions, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
+import { readLine } from '@scrypted/common/src/read-stream';
+import { parseHeaders, readBody, readMessage } from '@scrypted/common/src/rtsp-server';
+import contentType from 'content-type';
 import { IncomingMessage } from 'http';
-import { Readable } from 'stream';
+import { EventEmitter, Readable } from 'stream';
+import { Destroyable } from '../../rtsp/src/rtsp';
 import { getDeviceInfo } from './probe';
 
+export const detectionMap = {
+    human: 'person',
+    vehicle: 'car',
+}
+
 export function getChannel(channel: string) {
     return channel || '101';
 }
@@ -15,6 +24,8 @@ export enum HikvisionCameraEvent {
     // <eventType>linedetection</eventType>
     // <eventState>inactive</eventState>
     LineDetection = "<eventType>linedetection</eventType>",
+    RegionEntrance = "<eventType>regionEntrance</eventType>",
+    RegionExit = "<eventType>regionExit</eventType>",
     // <eventType>fielddetection</eventType>
     // <eventState>active</eventState>
     // <eventType>fielddetection</eventType>
@@ -31,7 +42,7 @@ export interface HikvisionCameraStreamSetup {
 export class HikvisionCameraAPI {
     credential: AuthFetchCredentialState;
     deviceModel: Promise<string>;
-    listenerPromise: Promise<IncomingMessage>;
+    listenerPromise: Promise<Destroyable>;
 
     constructor(public ip: string, username: string, password: string, public console: Console) {
         this.credential = {
@@ -129,35 +140,106 @@ export class HikvisionCameraAPI {
         return response.body;
     }
 
-    async listenEvents() {
+    async listenEvents(): Promise<Destroyable> {
+        const events = new EventEmitter();
+        (events as any).destroy = () => { };
         // support multiple cameras listening to a single single stream 
         if (!this.listenerPromise) {
             const url = `http://${this.ip}/ISAPI/Event/notification/alertStream`;
 
+
+            let lastSmartDetection: string;
+
             this.listenerPromise = this.request({
                 url,
                 responseType: 'readable',
             }).then(response => {
-                const stream = response.body;
+                const stream: IncomingMessage = response.body;
+                (events as any).destroy = () => {
+                    stream.destroy();
+                    events.removeAllListeners();
+                };
+                stream.on('close', () => {
+                    this.listenerPromise = undefined;
+                    events.emit('close');
+                });
+                stream.on('end', () => {
+                    this.listenerPromise = undefined;
+                    events.emit('end');
+                });
+                stream.on('error', e => {
+                    this.listenerPromise = undefined;
+                    events.emit('error', e);
+                });
                 stream.socket.setKeepAlive(true);
 
-                stream.on('data', (buffer: Buffer) => {
-                    const data = buffer.toString();
-                    for (const event of Object.values(HikvisionCameraEvent)) {
-                        if (data.indexOf(event) !== -1) {
-                            const cameraNumber = data.match(/<channelID>(.*?)</)?.[1] || data.match(/<dynChannelID>(.*?)</)?.[1];
-                            const inactive = data.indexOf('<eventState>inactive</eventState>') !== -1;
-                            stream.emit('event', event, cameraNumber, inactive, data);
+                const ct = stream.headers['content-type'];
+                // make content type parsable as content disposition filename
+                const cd = contentType.parse(ct);
+                let { boundary } = cd.parameters;
+                boundary = `--${boundary}`;
+                const boundaryEnd = `${boundary}--`;
+
+
+                (async () => {
+                    while (true) {
+                        let ignore = await readLine(stream);
+                        ignore = ignore.trim();
+                        if (!ignore)
+                            continue;
+                        if (ignore === boundaryEnd)
+                            continue;
+                        if (ignore !== boundary) {
+                            this.console.error('expected boundary but found', ignore);
+                            throw new Error('expected boundary');
+                        }
+
+                        const message = await readMessage(stream);
+                        events.emit('data', message);
+                        message.unshift('');
+                        const headers = parseHeaders(message);
+                        const body = await readBody(stream, headers);
+
+                        try {
+                            if (!headers['content-type'].includes('application/xml') && lastSmartDetection) {
+                                if (!headers['content-type']?.startsWith('image/jpeg')) {
+                                    continue;
+                                }
+                                events.emit('smart', lastSmartDetection, body);
+                                lastSmartDetection = undefined;
+                                continue;
+                            }
+
+                        }
+                        finally {
+                            // is it possible that smart detections are sent without images?
+                            // if so, flush this detection.
+                            if (lastSmartDetection) {
+                                events.emit('smart', lastSmartDetection);
+                            }
+                        }
+
+                        const data = body.toString();
+                        events.emit('data', data);
+                        for (const event of Object.values(HikvisionCameraEvent)) {
+                            if (data.indexOf(event) !== -1) {
+                                const cameraNumber = data.match(/<channelID>(.*?)</)?.[1] || data.match(/<dynChannelID>(.*?)</)?.[1];
+                                const inactive = data.indexOf('<eventState>inactive</eventState>') !== -1;
+                                events.emit('event', event, cameraNumber, inactive, data);
+                                if (event === HikvisionCameraEvent.LineDetection
+                                    || event === HikvisionCameraEvent.RegionEntrance
+                                    || event === HikvisionCameraEvent.RegionExit
+                                    || event === HikvisionCameraEvent.FieldDetection) {
+                                    lastSmartDetection = data;
+                                }
+                            }
                         }
                     }
-                });
-                return stream;
+                })()
+                    .catch(() => stream.destroy());
+                return events as any as Destroyable;
             });
             this.listenerPromise.catch(() => this.listenerPromise = undefined);
-            this.listenerPromise.then(stream => {
-                stream.on('close', () => this.listenerPromise = undefined);
-                stream.on('end', () => this.listenerPromise = undefined);
-            });
         }
 
         return this.listenerPromise;

plugins/hikvision/src/main.ts

@@ -1,11 +1,12 @@
-import sdk, { Camera, DeviceCreatorSettings, DeviceInformation, FFmpegInput, Intercom, MediaObject, MediaStreamOptions, Reboot, RequestPictureOptions, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting } from "@scrypted/sdk";
+import sdk, { Camera, DeviceCreatorSettings, DeviceInformation, FFmpegInput, Intercom, MediaObject, MediaStreamOptions, ObjectDetectionResult, ObjectDetectionTypes, ObjectDetector, ObjectsDetected, Reboot, RequestPictureOptions, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting } from "@scrypted/sdk";
+import crypto from 'crypto';
 import { PassThrough } from "stream";
 import xml2js from 'xml2js';
 import { RtpPacket } from '../../../external/werift/packages/rtp/src/rtp/rtp';
 import { OnvifIntercom } from "../../onvif/src/onvif-intercom";
 import { RtspProvider, RtspSmartCamera, UrlMediaStreamOptions } from "../../rtsp/src/rtsp";
 import { startRtpForwarderProcess } from '../../webrtc/src/rtp-forwarders';
-import { HikvisionCameraAPI, HikvisionCameraEvent } from "./hikvision-camera-api";
+import { HikvisionCameraAPI, HikvisionCameraEvent, detectionMap } from "./hikvision-camera-api";
 
 const { mediaManager } = sdk;
 
@@ -15,15 +16,17 @@ function channelToCameraNumber(channel: string) {
     return channel.substring(0, channel.length - 2);
 }
 
-class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboot {
+class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboot, ObjectDetector {
     detectedChannels: Promise<Map<string, MediaStreamOptions>>;
     client: HikvisionCameraAPI;
     onvifIntercom = new OnvifIntercom(this);
     activeIntercom: Awaited<ReturnType<typeof startRtpForwarderProcess>>;
+    hasSmartDetection: boolean;
 
     constructor(nativeId: string, provider: RtspProvider) {
         super(nativeId, provider);
 
+        this.hasSmartDetection = this.storage.getItem('hasSmartDetection') === 'true';
         this.updateDevice();
         this.updateDeviceInfo();
     }
@@ -63,41 +66,52 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
         let ignoreCameraNumber: boolean;
 
         const motionTimeoutDuration = 20000;
+
+        // check if the camera+channel field is in use, and filter events.
+        const checkCameraNumber = async (cameraNumber: string) => {
+            // check if the camera+channel field is in use, and filter events.
+            if (this.getRtspChannel()) {
+                // it is possible to set it up to use a camera number
+                // on an nvr IP (which gives RTSP urls through the NVR), but then use a http port
+                // that gives a filtered event stream from only that camera.
+                // this this case, the camera numbers will not
+                // match as they will be always be "1".
+                // to detect that a camera specific endpoint is being used
+                // can look at the channel ids, and see if that camera number is found.
+                // this is different from the use case where the NVR or camera
+                // is using a port other than 80 (the default).
+                // could add a setting to have the user explicitly denote nvr usage
+                // but that is error prone.
+                const userCameraNumber = this.getCameraNumber();
+                if (ignoreCameraNumber === undefined && this.detectedChannels) {
+                    const channelIds = (await this.detectedChannels).keys();
+                    ignoreCameraNumber = true;
+                    for (const id of channelIds) {
+                        if (channelToCameraNumber(id) === userCameraNumber) {
+                            ignoreCameraNumber = false;
+                            break;
+                        }
+                    }
+                }
+
+                if (!ignoreCameraNumber && cameraNumber !== userCameraNumber) {
+                    // this.console.error(`### Skipping motion event ${cameraNumber} != ${this.getCameraNumber()}`);
+                    return false;
+                }
+            }
+
+            return true;
+        };
+
         events.on('event', async (event: HikvisionCameraEvent, cameraNumber: string, inactive: boolean) => {
             if (event === HikvisionCameraEvent.MotionDetected
                 || event === HikvisionCameraEvent.LineDetection
+                || event === HikvisionCameraEvent.RegionEntrance
+                || event === HikvisionCameraEvent.RegionExit
                 || event === HikvisionCameraEvent.FieldDetection) {
 
-                // check if the camera+channel field is in use, and filter events.
-                if (this.getRtspChannel()) {
-                    // it is possible to set it up to use a camera number
-                    // on an nvr IP (which gives RTSP urls through the NVR), but then use a http port
-                    // that gives a filtered event stream from only that camera.
-                    // this this case, the camera numbers will not
-                    // match as they will be always be "1".
-                    // to detect that a camera specific endpoint is being used
-                    // can look at the channel ids, and see if that camera number is found.
-                    // this is different from the use case where the NVR or camera
-                    // is using a port other than 80 (the default).
-                    // could add a setting to have the user explicitly denote nvr usage
-                    // but that is error prone.
-                    const userCameraNumber = this.getCameraNumber();
-                    if (ignoreCameraNumber === undefined && this.detectedChannels) {
-                        const channelIds = (await this.detectedChannels).keys();
-                        ignoreCameraNumber = true;
-                        for (const id of channelIds) {
-                            if (channelToCameraNumber(id) === userCameraNumber) {
-                                ignoreCameraNumber = false;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (!ignoreCameraNumber && cameraNumber !== userCameraNumber) {
-                        // this.console.error(`### Skipping motion event ${cameraNumber} != ${this.getCameraNumber()}`);
-                        return;
-                    }
-                }
+                if (!await checkCameraNumber(cameraNumber))
+                    return;
 
                 this.motionDetected = true;
                 clearTimeout(motionTimeout);
@@ -106,11 +120,107 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
                     this.motionDetected = false;
                 }, motionTimeoutDuration);
             }
-        })
+        });
+
+        let inputDimensions: [number, number];
+
+        events.on('smart', async (data: string, image: Buffer) => {
+            if (!this.hasSmartDetection) {
+                this.hasSmartDetection = true;
+                this.storage.setItem('hasSmartDetection', 'true');
+                this.updateDevice();
+            }
+
+            const xml = await xml2js.parseStringPromise(data);
+
+
+            const [channelId] = xml.EventNotificationAlert.channelID;
+            if (!await checkCameraNumber(channelId)) {
+                this.console.warn('chann fail')
+                return;
+            }
+
+            const now = Date.now();
+            let detections: ObjectDetectionResult[] = xml.EventNotificationAlert?.DetectionRegionList?.map(region => {
+                const { DetectionRegionEntry } = region;
+                const dre = DetectionRegionEntry[0];
+                if (!DetectionRegionEntry)
+                    return;
+                const { detectionTarget } = dre;
+                // const { TargetRect } = dre;
+                // const { X, Y, width, height } = TargetRect[0];
+                const [name] = detectionTarget;
+                return {
+                    score: 1,
+                    className: detectionMap[name] || name,
+                    // boundingBox: [
+                    //     parseInt(X),
+                    //     parseInt(Y),
+                    //     parseInt(width),
+                    //     parseInt(height),
+                    // ],
+                    // movement: {
+                    //     moving: true,
+                    //     firstSeen: now,
+                    //     lastSeen: now,
+                    // }
+                } as ObjectDetectionResult;
+            });
+
+            detections = detections?.filter(d => d);
+            if (!detections?.length)
+                return;
+
+            // if (inputDimensions === undefined && loadSharp()) {
+            //     try {
+            //         const { image: i, metadata } = await loadVipsMetadata(image);
+            //         i.destroy();
+            //         inputDimensions = [metadata.width, metadata.height];
+            //     }
+            //     catch (e) {
+            //         inputDimensions = null;
+            //     }
+            //     finally {
+            //     }
+            // }
+
+            let detectionId: string;
+            if (image) {
+                detectionId = crypto.randomBytes(4).toString('hex');
+                this.recentDetections.set(detectionId, image);
+                setTimeout(() => this.recentDetections.delete(detectionId), 10000);
+            }
+
+            const detected: ObjectsDetected = {
+                inputDimensions,
+                detectionId,
+                timestamp: now,
+                detections,
+            };
+
+            this.onDeviceEvent(ScryptedInterface.ObjectDetector, detected);
+        });
 
         return events;
     }
 
+    recentDetections = new Map<string, Buffer>();
+
+    async getDetectionInput(detectionId: string, eventId?: any): Promise<MediaObject> {
+        const image = this.recentDetections.get(detectionId);
+        if (!image)
+            return;
+        return mediaManager.createMediaObject(image, 'image/jpeg');
+    }
+
+    async getObjectTypes(): Promise<ObjectDetectionTypes> {
+        return {
+            classes: [
+                ...Object.values(detectionMap),
+            ]
+        }
+    }
+
     createClient() {
         return new HikvisionCameraAPI(this.getHttpAddress(), this.getUsername(), this.getPassword(), this.console);
     }
@@ -284,6 +394,9 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
             interfaces.push(ScryptedInterface.Intercom);
         }
 
+        if (this.hasSmartDetection)
+            interfaces.push(ScryptedInterface.ObjectDetector);
+
         this.provider.updateDevice(this.nativeId, this.name, interfaces, type);
     }
 
@@ -408,7 +521,7 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
         const put = this.getClient().request({
             url,
             method: 'PUT',
-            responseType: 'readable',
+            responseType: 'text',
             headers: {
                 'Content-Type': 'application/octet-stream',
                 // 'Connection': 'close',
@@ -440,6 +553,12 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
         forwarder.killPromise.finally(() => {
             this.console.log('audio finished');
             passthrough.end();
+            setTimeout(() => {
+                this.stopIntercom();
+            }, 1000);
+        });
+
+        put.finally(() => {
             this.stopIntercom();
         });
 
@@ -448,7 +567,7 @@ class HikvisionCamera extends RtspSmartCamera implements Camera, Intercom, Reboo
             if (response.statusCode !== 200)
                 forwarder.kill();
         })
-        .catch(() => forwarder.kill());
+            .catch(() => forwarder.kill());
     }
 
     async stopIntercom(): Promise<void> {
@@ -581,4 +700,4 @@ class HikvisionProvider extends RtspProvider {
     }
 }
 
-export default new HikvisionProvider();
+export default HikvisionProvider;

plugins/homekit/.vscode/settings.json

@@ -1,4 +1,4 @@
 
 {
-    "scrypted.debugHost": "scrypted-server"
+    "scrypted.debugHost": "127.0.0.1"
 }

plugins/homekit/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.43",
+   "version": "1.2.57",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/homekit",
-         "version": "1.2.43",
+         "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": {

plugins/homekit/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/homekit",
-   "version": "1.2.43",
+   "version": "1.2.57",
    "description": "HomeKit Plugin for Scrypted",
    "scripts": {
       "scrypted-setup-project": "scrypted-setup-project",

plugins/homekit/src/hap-utils.ts

@@ -66,7 +66,7 @@ export function createHAPUsername() {
 }
 
 export function getAddresses() {
-    const addresses = Object.entries(os.networkInterfaces()).filter(([iface]) => iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan')).map(([_, addr]) => addr).flat().map(info => info.address).filter(address => address);
+    const addresses = Object.entries(os.networkInterfaces()).filter(([iface]) => iface.startsWith('en') || iface.startsWith('eth') || iface.startsWith('wlan') || iface.startsWith('net')).map(([_, addr]) => addr).flat().map(info => info.address).filter(address => address);
     return addresses;
 }
 
@@ -74,13 +74,17 @@ export function getRandomPort() {
     return Math.round(30000 + Math.random() * 20000);
 }
 
-export function createHAPUsernameStorageSettingsDict(device: { storage: Storage, name?: string }, group: string, subgroup?: string): StorageSettingsDict<'mac' | 'qrCode' | 'pincode' | 'portOverride' | 'resetAccessory'> {
+export function createHAPUsernameStorageSettingsDict(device: { storage: Storage, name?: string }, group: string, subgroup?: string): StorageSettingsDict<'mac' | 'addIdentifyingMaterial' | 'qrCode' | 'pincode' | 'portOverride' | 'resetAccessory'> {
     const alertReload = () => {
         sdk.log.a(`The HomeKit plugin will reload momentarily for the changes to ${device.name} to take effect.`);
         sdk.deviceManager.requestRestart();
     }
 
     return {
+        addIdentifyingMaterial: {
+            hide: true,
+            type: 'boolean',
+        },
         qrCode: {
             group,
             // subgroup,

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,6 +269,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
                     },
                         undefined, 'Pairing'));
                     storageSettings.settings.pincode.persistedDefaultValue = randomPinCode();
+                    storageSettings.settings.addIdentifyingMaterial.persistedDefaultValue = false;
 
                     const mixinConsole = deviceManager.getMixinConsole(device.id, this.nativeId);
 
@@ -277,7 +280,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
                             published = true;
                             mixinConsole.log('Device is in accessory mode and is online. HomeKit services are being published.');
 
-                            await this.publishAccessory(accessory, storageSettings.values.mac, storageSettings.values.pincode, standaloneCategory, storageSettings.values.portOverride);
+                            await this.publishAccessory(accessory, storageSettings.values.mac, storageSettings.values.pincode, standaloneCategory, storageSettings.values.portOverride, storageSettings.values.addIdentifyingMaterial);
                             if (!hasPublished) {
                                 hasPublished = true;
                                 storageSettings.values.qrCode = accessory.setupURI();
@@ -420,7 +423,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
         return bind;
     }
 
-    async publishAccessory(accessory: Accessory, username: string, pincode: string, category: Categories, port: number) {
+    async publishAccessory(accessory: Accessory, username: string, pincode: string, category: Categories, port: number, addIdentifyingMaterial: boolean) {
         const bind = await this.getAdvertiserInterfaceBind();
 
         await accessory.publish({
@@ -428,7 +431,7 @@ export class HomeKitPlugin extends ScryptedDeviceBase implements MixinProvider,
             port,
             pincode,
             category,
-            addIdentifyingMaterial: false,
+            addIdentifyingMaterial,
             advertiser: this.getAdvertiser(),
             bind,
         });

plugins/homekit/src/types/camera.ts

@@ -103,24 +103,22 @@ addSupportedType({
         const isRecordingEnabled = device.interfaces.includes(ScryptedInterface.MotionSensor);
 
         let configuration: CameraRecordingConfiguration;
-        const openRecordingStreams = new Map<number, Deferred<any>>();
+        const openRecordingStreams = new Map<number, AsyncGenerator<RecordingPacket>>();
         if (isRecordingEnabled) {
             recordingDelegate = {
                 updateRecordingConfiguration(newConfiguration: CameraRecordingConfiguration) {
                     configuration = newConfiguration;
                 },
                 handleRecordingStreamRequest(streamId: number): AsyncGenerator<RecordingPacket> {
-                    const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin);
-                    const d = new Deferred<any>();
-                    d.promise.then(reason => {
-                        ret.throw(new Error(reason.toString()));
-                        openRecordingStreams.delete(streamId);
-                    });
-                    openRecordingStreams.set(streamId, d);
+                    const ret = handleFragmentsRequests(streamId, device, configuration, console, homekitPlugin, 
+                        () => openRecordingStreams.has(streamId));
+                    openRecordingStreams.set(streamId, ret);
                     return ret;
                 },
                 closeRecordingStream(streamId, reason) {
-                    openRecordingStreams.get(streamId)?.resolve(reason);
+                    const r = openRecordingStreams.get(streamId);
+                    console.log(`motion recording closed ${reason > 0 ? `(error code: ${reason})` : ''}`);
+                    openRecordingStreams.delete(streamId);
                 },
                 updateRecordingActive(active) {
                 },

plugins/homekit/src/types/camera/camera-recording.ts

@@ -67,12 +67,29 @@ async function checkMp4StartsWithKeyFrame(console: Console, mp4: Buffer) {
         await timeoutPromise(1000, new Promise(resolve => cp.on('exit', resolve)));
         const h264 = Buffer.concat(buffers);
         let offset = 0;
+        let countedZeroes = 0;
         while (offset < h264.length - 6) {
-            if (h264.readInt32BE(offset) !== 1) {
+            const byte = h264[offset];
+            if (byte === 0) {
+                countedZeroes = Math.min(4, countedZeroes + 1);
                 offset++;
                 continue;
             }
-            offset += 4;
+
+            if (countedZeroes < 2) {
+                countedZeroes = 0;
+                offset++
+                continue;
+            }
+
+            countedZeroes = 0;
+            if (byte !== 1) {
+                offset++;
+                continue;
+            }
+
+            offset++;
+
             let naluType = h264.readUInt8(offset) & 0x1f;
             if (naluType === NAL_TYPE_FU_A) {
                 offset++;
@@ -99,7 +116,7 @@ async function checkMp4StartsWithKeyFrame(console: Console, mp4: Buffer) {
 }
 
 export async function* handleFragmentsRequests(streamId: number, device: ScryptedDevice & VideoCamera & MotionSensor & AudioSensor,
-    configuration: CameraRecordingConfiguration, console: Console, homekitPlugin: HomeKitPlugin): AsyncGenerator<RecordingPacket> {
+    configuration: CameraRecordingConfiguration, console: Console, homekitPlugin: HomeKitPlugin, isOpen: () => boolean): AsyncGenerator<RecordingPacket> {
 
     // homekitPlugin.storageSettings.values.lastKnownHomeHub = connection.remoteAddress;
 
@@ -177,7 +194,7 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
         }
 
         let audioArgs: string[];
-        if (transcodeRecording || isDefinitelyNotAAC || debugMode.audio) {
+        if (!noAudio && (transcodeRecording || isDefinitelyNotAAC || debugMode.audio)) {
             if (!(transcodeRecording || debugMode.audio))
                 console.warn('Recording audio is not explicitly AAC, forcing transcoding. Setting audio output to AAC is recommended.', audioCodec);
 
@@ -302,7 +319,11 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
         let needSkip = true;
         let ftyp: Buffer[];
         let moov: Buffer[];
+
         for await (const box of generator) {
+            if (!isOpen())
+                return;
+            
             const { header, type, data } = box;
             // console.log('motion fragment box', type);
 
@@ -314,7 +335,7 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                 checkMp4 = false;
                 // pending will contain the moof
                 try {
-                    if (!await checkMp4StartsWithKeyFrame(console, Buffer.concat([...ftyp, ...moov, ...pending, header, data]))) {
+                    if (false && !await checkMp4StartsWithKeyFrame(console, Buffer.concat([...ftyp, ...moov, ...pending, header, data]))) {
                         needSkip = false;
                         pending = [];
                         continue;
@@ -334,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 = [];
@@ -348,12 +371,12 @@ export async function* handleFragmentsRequests(streamId: number, device: Scrypte
                     break;
             }
         }
-        console.log(`motion recording finished`);
     }
     catch (e) {
-        console.log(`motion recording completed ${e}`);
+        console.log(`motion recording error ${e}`);
     }
     finally {
+        console.log(`motion recording finished`);
         clearTimeout(videoTimeout);
         cleanupPipes();
         recordingFile?.end();

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');
     }

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);
                 });
             }

plugins/mqtt/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/mqtt",
-   "version": "0.0.77",
+   "version": "0.0.80",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/mqtt",
-         "version": "0.0.77",
+         "version": "0.0.80",
          "dependencies": {
             "aedes": "^0.46.1",
             "axios": "^0.23.0",

plugins/mqtt/package.json

@@ -41,5 +41,5 @@
       "@types/node": "^18.4.2",
       "@types/nunjucks": "^3.2.0"
    },
-   "version": "0.0.77"
+   "version": "0.0.80"
 }

plugins/mqtt/src/autodiscovery.ts

@@ -6,6 +6,7 @@ import nunjucks from 'nunjucks';
 import sdk from "@scrypted/sdk";
 import type { MqttProvider } from './main';
 import { getHsvFromXyColor, getXyYFromHsvColor } from './color-util';
+import { MqttEvent } from './api/mqtt-client';
 
 const { deviceManager } = sdk;
 
@@ -25,7 +26,7 @@ typeMap.set('light', {
         const interfaces = [ScryptedInterface.OnOff, ScryptedInterface.Brightness];
         if (config.color_mode) {
             config.supported_color_modes.forEach(color_mode => {
-                if (color_mode === 'xy')  
+                if (color_mode === 'xy')
                     interfaces.push(ScryptedInterface.ColorSettingHsv);
                 else if (color_mode === 'hs')
                     interfaces.push(ScryptedInterface.ColorSettingHsv);
@@ -246,7 +247,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
             return;
         }
 
-        this.debounceCallbacks = new Map<string, Set<(payload: Buffer) => void>>(); 
+        this.debounceCallbacks = new Map<string, Set<(payload: Buffer) => void>>();
 
         const { client } = provider;
         client.on('message', this.listener.bind(this));
@@ -297,7 +298,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
         this.console.log('binding...');
         const { client } = this.provider;
 
-        this.debounceCallbacks = new Map<string, Set<(payload: Buffer) => void>>(); 
+        this.debounceCallbacks = new Map<string, Set<(payload: Buffer) => void>>();
 
         if (this.providedInterfaces.includes(ScryptedInterface.Online)) {
             const config = this.loadComponentConfig(ScryptedInterface.Online);
@@ -468,7 +469,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                 config.command_off_template,
                 command, "ON");
         } else {
-            this.publishValue(config.command_topic, 
+            this.publishValue(config.command_topic,
                 undefined, command, command);
         }
     }
@@ -489,7 +490,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                 config.command_on_template,
                 command, "ON");
         } else {
-            this.publishValue(config.command_topic, 
+            this.publishValue(config.command_topic,
                 undefined, command, command);
         }
     }
@@ -506,8 +507,8 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                 config.brightness_value_template,
                 scaledBrightness, scaledBrightness);
         } else {
-            this.publishValue(config.command_topic, 
-                `{ "state": "${ scaledBrightness === 0 ? 'OFF' : 'ON'}", "brightness": ${scaledBrightness} }`, 
+            this.publishValue(config.command_topic,
+                `{ "state": "${scaledBrightness === 0 ? 'OFF' : 'ON'}", "brightness": ${scaledBrightness} }`,
                 scaledBrightness, 255);
         }
     }
@@ -525,7 +526,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
         if (kelvin >= 0 || kelvin <= 100) {
             const min = await this.getTemperatureMinK();
             const max = await this.getTemperatureMaxK();
-            const diff = (max - min) * (kelvin/100);
+            const diff = (max - min) * (kelvin / 100);
             kelvin = Math.round(min + diff);
         }
 
@@ -542,7 +543,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                 config.color_temp_command_template,
                 color, color);
         } else {
-            this.publishValue(config.command_topic, 
+            this.publishValue(config.command_topic,
                 undefined, color, color);
         }
     }
@@ -567,7 +568,7 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                     config.hs_command_template,
                     color, color);
             } else {
-                this.publishValue(config.command_topic, 
+                this.publishValue(config.command_topic,
                     undefined, color, color);
             }
         } else if (this.colorMode === "xy") {
@@ -589,12 +590,12 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
                     config.xy_command_template,
                     color, color);
             } else {
-                this.publishValue(config.command_topic, 
+                this.publishValue(config.command_topic,
                     undefined, color, color);
             }
-        } 
+        }
     }
-    
+
     async lock(): Promise<void> {
         const config = this.loadComponentConfig(ScryptedInterface.Lock);
         return this.publishValue(config.command_topic,
@@ -610,6 +611,9 @@ export class MqttAutoDiscoveryDevice extends ScryptedDeviceBase implements Onlin
 interface AutoDiscoveryConfig {
     component: string;
     create: (mqttId: string, device: MixinDeviceBase<any>, topic: string) => any;
+    subscriptions?: {
+        [topic: string]: (device: MixinDeviceBase<any>, event: MqttEvent) => void;
+    }
 }
 
 const autoDiscoveryMap = new Map<string, AutoDiscoveryConfig>();
@@ -676,7 +680,31 @@ autoDiscoveryMap.set(ScryptedInterface.HumiditySensor, {
     }
 });
 
-export function publishAutoDiscovery(mqttId: string, client: Client, device: MixinDeviceBase<any>, topic: string, autoDiscoveryPrefix = 'homeassistant') {
+autoDiscoveryMap.set(ScryptedInterface.OnOff, {
+    component: 'switch',
+    create(mqttId, device, topic) {
+        return {
+            payload_on: 'true',
+            payload_off: 'false',
+            state_topic: `${topic}/${ScryptedInterfaceProperty.on}`,
+            command_topic: `${topic}/${ScryptedInterfaceProperty.on}/set`,
+            ...getAutoDiscoveryDevice(device, mqttId),
+        }
+    },
+    subscriptions: {
+        'on/set': (device, event) => {
+            const d = sdk.systemManager.getDeviceById<OnOff>(device.id);
+            if (event.json)
+                d.turnOn();
+            else
+                d.turnOff();
+        }
+    },
+});
+
+export function publishAutoDiscovery(mqttId: string, client: Client, device: MixinDeviceBase<any>, topic: string, subscribe: boolean, autoDiscoveryPrefix = 'homeassistant') {
+    const subs = new Set<string>();
+
     for (const iface of device.interfaces) {
         const found = autoDiscoveryMap.get(iface);
         if (!found)
@@ -691,5 +719,38 @@ export function publishAutoDiscovery(mqttId: string, client: Client, device: Mix
         client.publish(configTopic, JSON.stringify(config), {
             retain: true,
         });
+
+        if (subscribe) {
+            const subscriptions = found.subscriptions || {};
+            for (const subscriptionTopic of Object.keys(subscriptions || {})) {
+                subs.add(subscriptionTopic);
+
+                const fullTopic = topic + '/' + subscriptionTopic;
+                const cb = subscriptions[subscriptionTopic];
+                client.subscribe(fullTopic)
+                client.on('message', (messageTopic, message) => {
+                    if (fullTopic !== messageTopic && fullTopic !== '/' + messageTopic)
+                        return;
+                    device.console.log('mqtt message', subscriptionTopic, message.toString());
+                    cb(device, {
+                        get text() {
+                            return message.toString();
+                        },
+                        get json() {
+                            try {
+                                return JSON.parse(message.toString());
+                            }
+                            catch (e) {
+                            }
+                        },
+                        get buffer() {
+                            return message;
+                        }
+                    })
+                });
+            }
+        }
     }
+
+    return subs;
 }

plugins/mqtt/src/main.ts

@@ -294,13 +294,15 @@ class MqttPublisherMixin extends SettingsMixinDeviceBase<any> {
             allProperties.push(...properties);
         }
 
+        let found: ReturnType<typeof publishAutoDiscovery>;
+
         client.on('connect', packet => {
             this.console.log('MQTT client connected, publishing current state.');
             for (const method of allMethods) {
                 client.subscribe(this.pathname + '/' + method);
             }
 
-            publishAutoDiscovery(this.provider.storageSettings.values.mqttId, client, this, this.pathname, 'homeassistant');
+            found = publishAutoDiscovery(this.provider.storageSettings.values.mqttId, client, this, this.pathname, true, 'homeassistant');
             client.subscribe('homeassistant/status');
             this.publishState(client);
         });
@@ -311,14 +313,17 @@ class MqttPublisherMixin extends SettingsMixinDeviceBase<any> {
 
         client.on('message', async (messageTopic, message) => {
             if (messageTopic === 'homeassistant/status') {
-                publishAutoDiscovery(this.provider.storageSettings.values.mqttId, client, this, this.pathname, 'homeassistant');
+                publishAutoDiscovery(this.provider.storageSettings.values.mqttId, client, this, this.pathname, false, 'homeassistant');
                 this.publishState(client);
                 return;
             }
             const method = messageTopic.substring(this.pathname.length + 1);
             if (!allMethods.includes(method)) {
-                if (!allProperties.includes(method))
-                    this.console.warn('unknown topic', method);
+                if (!allProperties.includes(method)) {
+                    if (!found?.has(method)) {
+                        this.console.warn('unknown topic', method);
+                    }
+                }
                 return;
             }
             try {
@@ -592,7 +597,7 @@ export class MqttProvider extends ScryptedDeviceBase implements DeviceProvider,
         return isPublishable(type, interfaces) ? [ScryptedInterface.Settings] : undefined;
     }
 
-    async getMixin(mixinDevice: any, mixinDeviceInterfaces: ScryptedInterface[], mixinDeviceState:WritableDeviceState): Promise<any> {
+    async getMixin(mixinDevice: any, mixinDeviceInterfaces: ScryptedInterface[], mixinDeviceState: WritableDeviceState): Promise<any> {
         return new MqttPublisherMixin(this, {
             mixinDevice,
             mixinDeviceState,

plugins/objectdetector/package-lock.json

@@ -1,12 +1,12 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.1.33",
+   "version": "0.1.42",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
       "": {
          "name": "@scrypted/objectdetector",
-         "version": "0.1.33",
+         "version": "0.1.42",
          "license": "Apache-2.0",
          "dependencies": {
             "@scrypted/common": "file:../../common",

plugins/objectdetector/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@scrypted/objectdetector",
-   "version": "0.1.33",
+   "version": "0.1.42",
    "description": "Scrypted Video Analysis Plugin. Installed alongside a detection service like OpenCV or TensorFlow.",
    "author": "Scrypted",
    "license": "Apache-2.0",

plugins/objectdetector/src/edit-distance.ts

@@ -0,0 +1,75 @@
+// visual similarity
+const similarCharacters = [
+  ['0', 'O', 'D'],
+  ['1', 'I'],
+  ['2', 'Z'],
+  ['4', 'A'],
+  ['5', 'S'],
+  ['8', 'B'],
+  ['6', 'G'],
+  // not sure about this one.
+  ['A', '4'],
+  ['C', 'G'],
+  ['E', 'F'],
+];
+
+const similarCharactersMap = new Map<string, Set<string>>();
+for (const similarCharacter of similarCharacters) {
+  for (const character of similarCharacter) {
+    if (!similarCharactersMap.has(character)) {
+      similarCharactersMap.set(character, new Set());
+    }
+    for (const similar of similarCharacter) {
+      similarCharactersMap.get(character)!.add(similar);
+    }
+  }
+}
+
+function isSameCharacter(c1: string, c2: string) {
+  if (c1 === c2)
+    return true;
+
+  return similarCharactersMap.get(c1)?.has(c2);
+}
+
+export function levenshteinDistance(str1: string, str2: string): number {
+  // todo: handle lower/uppercase similarity in similarCharacters above.
+  // ie, b is visualy similar to 6, but does not really look like B.
+  // others include e and C. v, u and Y. l, i, 1.
+  str1 = str1.toUpperCase();
+  str2 = str2.toUpperCase();
+
+  const len1 = str1.length;
+  const len2 = str2.length;
+
+  // If either string is empty, the distance is the length of the other string
+  if (len1 === 0) return len2;
+  if (len2 === 0) return len1;
+
+  let prev: number[] = new Array(len2 + 1);
+  let curr: number[] = new Array(len2 + 1);
+
+  // Initialize the first row of the matrix to be the index of the second string
+  for (let i = 0; i <= len2; i++) {
+    prev[i] = i;
+  }
+
+  for (let i = 1; i <= len1; i++) {
+    // Initialize the current row with the distance from the previous row's first element
+    curr[0] = i;
+
+    for (let j = 1; j <= len2; j++) {
+      let cost = isSameCharacter(str1.charAt(i - 1), str2.charAt(j - 1)) ? 0 : 1;
+
+      // Compute the minimum of three possible operations: insertion, deletion, or substitution
+      curr[j] = Math.min(prev[j] + 1, curr[j - 1] + 1, prev[j - 1] + cost);
+    }
+
+    // Swap the previous and current rows for the next iteration
+    const temp = prev;
+    prev = curr;
+    curr = temp;
+  }
+
+  return prev[len2];
+}

plugins/objectdetector/src/main.ts

@@ -162,7 +162,7 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
   getCurrentSettings() {
     const settings = this.model.settings;
     if (!settings)
-      return;
+      return { id : this.id };
 
     const ret: { [key: string]: any } = {};
     for (const setting of settings) {
@@ -183,7 +183,10 @@ class ObjectDetectionMixin extends SettingsMixinDeviceBase<VideoCamera & Camera
     if (this.hasMotionType)
       ret['motionAsObjects'] = true;
 
-    return ret;
+    return {
+      ...ret,
+      id: this.id,
+    };
   }
 
   maybeStartDetection() {
@@ -910,9 +913,10 @@ class ObjectDetectorMixin extends MixinDeviceBase<ObjectDetection> implements Mi
     let objectDetection = systemManager.getDeviceById<ObjectDetection>(this.id);
     const hasMotionType = this.model.classes.includes('motion');
     const group = hasMotionType ? 'Motion Detection' : 'Object Detection';
+    const model = await objectDetection.getDetectionModel({ id: mixinDeviceState.id });
     // const group = objectDetection.name.replace('Plugin', '').trim();
 
-    const ret = new ObjectDetectionMixin(this.plugin, mixinDevice, mixinDeviceInterfaces, mixinDeviceState, this.mixinProviderNativeId, objectDetection, this.model, group, hasMotionType);
+    const ret = new ObjectDetectionMixin(this.plugin, mixinDevice, mixinDeviceInterfaces, mixinDeviceState, this.mixinProviderNativeId, objectDetection, model, group, hasMotionType);
     this.currentMixins.add(ret);
     return ret;
   }
@@ -1155,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();
     }
   }
 

plugins/objectdetector/src/smart-motionsensor.ts

@@ -1,8 +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 { 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 {
@@ -25,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,
         },
@@ -44,7 +46,7 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
             defaultValue: 0.7,
         },
         requireDetectionThumbnail: {
-            title: 'Rquire Detections with Images',
+            title: 'Require Detections with Images',
             description: 'When enabled, this sensor will ignore detections results that do not have images.',
             type: 'boolean',
             defaultValue: false,
@@ -55,9 +57,32 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
             type: 'boolean',
             defaultValue: false,
         },
+        labels: {
+            group: 'Recognition',
+            title: 'Labels',
+            description: 'The labels (license numbers, names) that will trigger this smart motion sensor.',
+            multiple: true,
+            combobox: true,
+            choices: [],
+        },
+        labelDistance: {
+            group: 'Recognition',
+            title: 'Label Distance',
+            description: 'The maximum edit distance between the detected label and the desired label. Ie, a distance of 1 will match "abcde" to "abcbe" or "abcd".',
+            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>;
 
@@ -127,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);
@@ -136,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;
 
@@ -151,12 +180,26 @@ 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, labelScore } = this.storageSettings.values;
+
             const match = detected.detections?.find(d => {
                 if (this.storageSettings.values.requireScryptedNvrDetections && !d.boundingBox)
                     return false;
@@ -181,10 +224,38 @@ export class SmartMotionSensor extends ScryptedDeviceBase implements Settings, R
                         this.console.warn('Camera does not provide Zones in detection event. Zone filter will not be applied.');
                     }
                 }
-                if (!d.movement)
-                    return true;
-                return d.movement.moving;
-            })
+
+                // when not searching for a label, validate the object is moving.
+                if (!labels?.length)
+                    return !d.movement || d.movement.moving;
+
+                if (!d.label)
+                    return false;
+
+                for (const label of labels) {
+                    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) {
+                        this.console.log('Label does not match.', label, d.label, d.labelScore);
+                        continue;
+                    }
+
+                    if (!labelScore || d.labelScore >= labelScore)
+                        return true;
+                    this.console.log('Label score too low.', d.labelScore);
+                }
+
+                return false;
+            });
+
             if (match) {
                 if (!this.motionDetected)
                     console.log('Smart Motion Sensor triggered on', match);

plugins/onnx/.npmignore

@@ -9,6 +9,7 @@ dist/*.js
 dist/*.txt
 __pycache__
 all_models
-.venv
+sort_oh
 download_models.sh
 tsconfig.json
+.venv

plugins/onnx/.vscode/settings.json

@@ -1,9 +1,11 @@
 
 {
     // docker installation
-    // "scrypted.debugHost": "koushik-thin",
+    // "scrypted.debugHost": "koushik-ubuntuvm",
     // "scrypted.serverRoot": "/server",
-
+    // "scrypted.debugHost": "koushik-ubuntuvm",
+    // "scrypted.serverRoot": "/home/koush/.scrypted",
+ 
     // pi local installation
     // "scrypted.debugHost": "192.168.2.119",
     // "scrypted.serverRoot": "/home/pi/.scrypted",
@@ -11,6 +13,8 @@
     // 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": [

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.