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

ui: implement backup/restore
amcrest: Implemented other intercom codec for Dahua doorbells (G.711A). (#1273 )
2026-02-07 16:02:13 +00:00 · 2024-01-18 13:15:41 -08:00 · 2024-01-18 13:15:37 -08:00 · 2024-01-18 12:36:11 -08:00 · 2024-01-18 09:33:13 -08:00 · 2024-01-17 22:07:56 -08:00
49 changed files with 582 additions and 569 deletions
--- a/.github/workflows/docker-common.yml
+++ b/.github/workflows/docker-common.yml
@@ -15,7 +15,7 @@ jobs:
          # "20"
        ]
        BASE: ["jammy"]
-        FLAVOR: ["full", "lite", "thin"]
+        FLAVOR: ["full", "lite"]
    steps:
      - name: Check out the repo
        uses: actions/checkout@v3
--- a/common/src/eval/scrypted-eval.ts
+++ b/common/src/eval/scrypted-eval.ts
@@ -3,6 +3,7 @@ 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;

@@ -22,9 +23,13 @@ export async function tsCompile(source: string, options: TranspileOptions = null
    return ts.transpileModule(source, options).outputText;
 }

+export function readFileAsString(f: string) {
+    return fs.readFileSync(f).toString();;
+}
+
 function getTypeDefs() {
-    const scryptedTypesDefs = fs.readFileSync('@types/sdk/types.d.ts').toString();
-    const scryptedIndexDefs = fs.readFileSync('@types/sdk/index.d.ts').toString();
+    const scryptedTypesDefs = readFileAsString('@types/sdk/types.d.ts');
+    const scryptedIndexDefs = readFileAsString('@types/sdk/index.d.ts');
    return {
        scryptedIndexDefs,
        scryptedTypesDefs,
@@ -104,7 +109,7 @@ export async function scryptedEval(device: ScryptedDeviceBase, script: string, e
 }

 export function createMonacoEvalDefaults(extraLibs: { [lib: string]: string }) {
-    const bufferTypeDefs = fs.readFileSync('@types/node/buffer.d.ts').toString();
+    const bufferTypeDefs= readFileAsString('@types/node/buffer.d.ts');

    const safeLibs = {
        bufferTypeDefs,
--- a/install/config.yaml
+++ b/install/config.yaml
@@ -1,6 +1,6 @@
 # Home Assistant Addon Configuration
 name: Scrypted
-version: "18-jammy-full.s6-v0.80.0"
+version: "18-jammy-full.s6-v0.85.0"
 slug: scrypted
 description: Scrypted is a high performance home video integration and automation platform
 url: "https://github.com/koush/scrypted"
--- a/install/docker/Dockerfile
+++ b/install/docker/Dockerfile
@@ -16,6 +16,6 @@ ENV NODE_OPTIONS="--dns-result-order=ipv4first"

 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
+ENV SCRYPTED_BASE_VERSION="20241303"

 CMD npm --prefix /server exec scrypted-serve
--- a/install/docker/Dockerfile.lite
+++ b/install/docker/Dockerfile.lite
@@ -6,13 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # base tools and development stuff
 RUN apt-get update && apt-get -y install \
    curl software-properties-common apt-utils \
-    build-essential \
-    cmake \
-    ffmpeg \
-    gcc \
-    libcairo2-dev \
-    libgirepository1.0-dev \
-    pkg-config && \
+    ffmpeg && \
    apt-get -y update && \
    apt-get -y upgrade

--- a/install/docker/Dockerfile.s6
+++ b/install/docker/Dockerfile.s6
@@ -46,6 +46,6 @@ ENV NODE_OPTIONS="--dns-result-order=ipv4first"

 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.
-ENV SCRYPTED_BASE_VERSION="20240103"
+ENV SCRYPTED_BASE_VERSION="20241303"

 CMD npm --prefix /server exec scrypted-serve
--- a/npm-install.sh
+++ b/npm-install.sh
@@ -14,7 +14,7 @@ cd $(dirname $0)
 git submodule init
 git submodule update

-for directory in sdk common server packages/client
+for directory in sdk common server packages/client packages/auth-fetch
 do
    echo "$directory > npm install"
    pushd $directory
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -19,6 +19,8 @@ import { httpFetch } from '../../../server/src/fetch/http-fetch';

 let fetcher: typeof httpFetch | typeof domFetch;
 try {
+    if (process.arch === 'browser' as any)
+        throw new Error();
    require('net');
    require('events');
    fetcher = httpFetch;
--- a/plugins/amcrest/package-lock.json
+++ b/plugins/amcrest/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/amcrest",
-   "version": "0.0.131",
+   "version": "0.0.132",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/amcrest",
-         "version": "0.0.131",
+         "version": "0.0.132",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/amcrest/package.json
+++ b/plugins/amcrest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/amcrest",
-   "version": "0.0.131",
+   "version": "0.0.132",
   "description": "Amcrest Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/amcrest/src/main.ts
+++ b/plugins/amcrest/src/main.ts
@@ -495,6 +495,8 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
            return this.onvifIntercom.startIntercom(media);
        }

+        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';
@@ -505,12 +507,29 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
        const args = ffmpegInput.inputArguments.slice();
        args.unshift('-hide_banner');

-        args.push(
-            "-vn",
-            '-acodec', 'aac',
-            '-f', 'adts',
-            'pipe:3',
-        );
+        let contentType: string;
+
+        if (doorbellType == DAHUA_DOORBELL_TYPE) {
+            args.push(
+                "-vn",
+                '-acodec', 'pcm_alaw',
+                '-ac', '1',
+                '-ar', '8000',
+                '-sample_fmt', 's16',
+                '-f', 'alaw',
+                'pipe:3',
+            );
+            contentType = 'Audio/G.711A';
+        }
+        else {
+            args.push(
+                      "-vn",
+                      '-acodec', 'aac',
+                      '-f', 'adts',
+                      'pipe:3',
+                      );
+            contentType = 'Audio/AAC';
+        }

        this.console.log('ffmpeg intercom', args);

@@ -533,7 +552,7 @@ class AmcrestCamera extends RtspSmartCamera implements VideoCameraConfiguration,
                url,
                method: 'POST',
                headers: {
-                    'Content-Type': 'Audio/AAC',
+                    'Content-Type': contentType,
                    'Content-Length': '9999999'
                },
                responseType: 'readable',
@@ -588,7 +607,7 @@ class AmcrestProvider extends RtspProvider {

        const username = settings.username?.toString();
        const password = settings.password?.toString();
-        const skipValidate = settings.skipValidate === 'true';
+        const skipValidate = settings.skipValidate?.toString() === 'true';
        let twoWayAudio: string;
        if (!skipValidate) {
            const api = new AmcrestCameraClient(httpAddress, username, password, this.console);
--- a/plugins/core/package-lock.json
+++ b/plugins/core/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/core",
-   "version": "0.2.3",
+   "version": "0.3.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/core",
-         "version": "0.2.3",
+         "version": "0.3.1",
         "license": "Apache-2.0",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/core/package.json
+++ b/plugins/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/core",
-   "version": "0.2.3",
+   "version": "0.3.1",
   "description": "Scrypted Core plugin. Provides the UI, websocket, and engine.io APIs.",
   "author": "Scrypted",
   "license": "Apache-2.0",
--- a/plugins/core/src/main.ts
+++ b/plugins/core/src/main.ts
@@ -1,4 +1,4 @@
-import { tsCompile } from '@scrypted/common/src/eval/scrypted-eval';
+import { readFileAsString, tsCompile } from '@scrypted/common/src/eval/scrypted-eval';
 import sdk, { DeviceProvider, EngineIOHandler, HttpRequest, HttpRequestHandler, HttpResponse, ScryptedDeviceBase, ScryptedDeviceType, ScryptedInterface, Setting, Settings, SettingValue } from '@scrypted/sdk';
 import { StorageSettings } from "@scrypted/sdk/storage-settings";
 import fs from 'fs';
@@ -64,8 +64,7 @@ class ScryptedCore extends ScryptedDeviceBase implements HttpRequestHandler, Eng
    constructor() {
        super();

-
-        this.indexHtml = fs.readFileSync('dist/index.html').toString();
+        this.indexHtml = readFileAsString('dist/index.html');

        (async () => {
            await deviceManager.onDeviceDiscovered(
--- a/plugins/core/src/script.ts
+++ b/plugins/core/src/script.ts
@@ -3,7 +3,6 @@ import { scryptedEval } from "./scrypted-eval";
 import { monacoEvalDefaults } from "./monaco";
 import { createScriptDevice, ScriptDeviceImpl } from "@scrypted/common/src/eval/scrypted-eval";
 import { ScriptCoreNativeId } from "./script-core";
-import { PluginAPIProxy } from "../../../server/src/plugin/plugin-api";

 const { deviceManager } = sdk;

--- a/plugins/core/ui/package-lock.json
+++ b/plugins/core/ui/package-lock.json
@@ -111,22 +111,22 @@
      "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.2.108",
+      "version": "0.3.4",
      "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",
@@ -158,7 +158,7 @@
    },
    "../../../sdk/types": {
      "name": "@scrypted/types",
-      "version": "0.2.99",
+      "version": "0.3.4",
      "license": "ISC",
      "devDependencies": {
        "@types/rimraf": "^3.0.2",
--- a/plugins/core/ui/src/components/builtin/SettingsComponent.vue
+++ b/plugins/core/ui/src/components/builtin/SettingsComponent.vue
@@ -71,6 +71,9 @@
          ><v-toolbar-title>Server Management</v-toolbar-title></v-toolbar
        >
        <v-card-actions>
+          <v-btn text href="/web/component/backup" color="info">Backup</v-btn>
+          <v-btn text color="info" @click="restoreClick">Restore</v-btn>
+          <input type="file" ref="restoreFile" style="display: none;" @change="restore"/>
          <v-spacer></v-spacer>
          <v-dialog v-model="restart" width="500">
            <template v-slot:activator="{ on }">
@@ -126,6 +129,22 @@ export default {
    this.checkUpdateAvailable();
  },
  methods: {
+    async restoreClick() {
+      const restoreFile = this.$refs.restoreFile;
+      restoreFile.click();
+    },
+    async restore() {
+      const restoreFile = this.$refs.restoreFile;
+      const file = restoreFile.files[0];
+      if (!file)
+        return;
+      console.log(file);
+      const fileBlob = new Blob([file]);
+      await fetch('/web/component/restore', {
+        method: 'POST',
+        body: fileBlob,
+      });
+    },
    async checkUpdateAvailable() {
      const info = await this.$scrypted.systemManager.getComponent("info");
      const version = await info.getVersion();
--- a/plugins/core/ui/src/components/builtin/system-settings.ts
+++ b/plugins/core/ui/src/components/builtin/system-settings.ts
@@ -42,15 +42,28 @@ export function createSystemSettingsDevice(systemManager: SystemManager): Scrypt
            const results = systemSettings.map(async d => {
                const settings = await d.getSettings();
                for (const setting of settings) {
+                    const subgroup  = setting.group;
                    if (d.pluginId === '@scrypted/core')
                        setting.group = 'General';
                    else
                        setting.group = d.name;
+                    setting.subgroup = subgroup;
                    setting.key = d.id + ':' + setting.key;
                }
                return settings;
            });
-            return (await Promise.all(results)).flat();
+            const ret = (await Promise.all(results)).flat();
+            ret.sort((a, b) => {
+                if (a.group === 'General') {
+                    if (b.group === 'General')
+                        return 0;
+                    return -1;
+                }
+                if (b.group === 'General')
+                    return 1;
+                return 0;
+            });
+            return ret;
        },
        async putSetting(key, value) {
            const [id, realKey] = key.split(':');
--- a/plugins/hikvision/package-lock.json
+++ b/plugins/hikvision/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/hikvision",
-   "version": "0.0.133",
+   "version": "0.0.134",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/hikvision",
-         "version": "0.0.133",
+         "version": "0.0.134",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/hikvision/package.json
+++ b/plugins/hikvision/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/hikvision",
-   "version": "0.0.133",
+   "version": "0.0.134",
   "description": "Hikvision Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/hikvision/src/main.ts
+++ b/plugins/hikvision/src/main.ts
@@ -525,7 +525,7 @@ class HikvisionProvider extends RtspProvider {

        const username = settings.username?.toString();
        const password = settings.password?.toString();
-        const skipValidate = settings.skipValidate === 'true';
+        const skipValidate = settings.skipValidate?.toString() === 'true';
        let twoWayAudio: string;
        if (!skipValidate) {
            const api = new HikvisionCameraAPI(httpAddress, username, password, this.console);
--- a/plugins/homekit/package-lock.json
+++ b/plugins/homekit/package-lock.json
@@ -1,26 +1,26 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.34",
+   "version": "1.2.36",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/homekit",
-         "version": "1.2.34",
+         "version": "1.2.36",
         "dependencies": {
            "@koush/werift-src": "file:../../external/werift",
-            "check-disk-space": "^3.3.1",
-            "hap-nodejs": "^0.11.0",
+            "check-disk-space": "^3.4.0",
+            "hap-nodejs": "^0.11.1",
            "lodash": "^4.17.21",
-            "mkdirp": "^2.1.6"
+            "mkdirp": "^3.0.1"
         },
         "devDependencies": {
            "@scrypted/common": "file:../../common",
            "@scrypted/sdk": "file:../../sdk",
-            "@types/debug": "^4.1.7",
-            "@types/lodash": "^4.14.192",
-            "@types/node": "^18.15.11",
-            "@types/url-parse": "^1.4.8"
+            "@types/debug": "^4.1.12",
+            "@types/lodash": "^4.14.202",
+            "@types/node": "^20.11.0",
+            "@types/url-parse": "^1.4.11"
         }
      },
      "../../common": {
@@ -31,12 +31,12 @@
         "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"
         }
      },
      "../../external/werift": {
@@ -47,25 +47,26 @@
            "examples/*"
         ],
         "devDependencies": {
-            "@types/jest": "^29.2.4",
-            "@types/node": "^18.11.18",
-            "@typescript-eslint/eslint-plugin": "^5.47.1",
-            "@typescript-eslint/parser": "^5.47.1",
-            "eslint": "^8.30.0",
-            "eslint-config-prettier": "^8.5.0",
-            "eslint-plugin-prettier": "^4.2.1",
-            "eslint-plugin-simple-import-sort": "^8.0.0",
-            "jest": "^29.3.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",
+            "jest": "^29.7.0",
+            "knip": "^3.7.0",
            "node-actionlint": "^1.2.2",
            "organize-imports-cli": "^0.10.0",
-            "prettier": "^2.8.1",
+            "prettier": "^3.1.1",
            "process": "^0.11.10",
-            "ts-jest": "^29.0.3",
-            "ts-node": "^10.9.1",
+            "ts-jest": "^29.1.1",
+            "ts-node": "^10.9.2",
            "ts-node-dev": "^2.0.0",
-            "typedoc": "^0.23.23",
-            "typedoc-plugin-markdown": "^3.14.0",
-            "typescript": "^4.9.4"
+            "typedoc": "0.25.4",
+            "typedoc-plugin-markdown": "3.17.1",
+            "typescript": "5.0.4"
         },
         "engines": {
            "node": ">=16"
@@ -126,13 +127,13 @@
      },
      "../../sdk": {
         "name": "@scrypted/sdk",
-         "version": "0.2.86",
+         "version": "0.3.4",
         "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",
@@ -220,9 +221,9 @@
         }
      },
      "node_modules/@homebridge/dbus-native": {
-         "version": "0.5.0",
-         "resolved": "https://registry.npmjs.org/@homebridge/dbus-native/-/dbus-native-0.5.0.tgz",
-         "integrity": "sha512-ei0jyHE/uNDl/6D6heRwsqnESrrXuSlfp+xlwGfg3mo1OqhKvyb/Kp73uxQyOJ3f1T1ocLSyA5uzoR1AbfaXIQ==",
+         "version": "0.5.1",
+         "resolved": "https://registry.npmjs.org/@homebridge/dbus-native/-/dbus-native-0.5.1.tgz",
+         "integrity": "sha512-7xXz3R1W/kcbfQOGp32y4K7etqtowICR1vpx8j85KwPYXbNQrgiZ3zcwDYgDGBWq3FD9xzsW7h4YWJ4vTR2seQ==",
         "dependencies": {
            "@homebridge/long": "^5.2.1",
            "@homebridge/put": "~0.0.8",
@@ -230,7 +231,7 @@
            "hexy": "^0.2.10",
            "minimist": "^1.2.6",
            "safe-buffer": "^5.1.1",
-            "xml2js": "^0.4.17"
+            "xml2js": "^0.5.0"
         },
         "bin": {
            "dbus2js": "bin/dbus2js.js"
@@ -267,18 +268,18 @@
         "link": true
      },
      "node_modules/@types/debug": {
-         "version": "4.1.7",
-         "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-         "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+         "version": "4.1.12",
+         "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+         "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
         "dev": true,
         "dependencies": {
            "@types/ms": "*"
         }
      },
      "node_modules/@types/lodash": {
-         "version": "4.14.192",
-         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.192.tgz",
-         "integrity": "sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==",
+         "version": "4.14.202",
+         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
+         "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
         "dev": true
      },
      "node_modules/@types/ms": {
@@ -288,15 +289,18 @@
         "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==",
-         "dev": true
+         "version": "20.11.0",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+         "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
+         "dev": true,
+         "dependencies": {
+            "undici-types": "~5.26.4"
+         }
      },
      "node_modules/@types/url-parse": {
-         "version": "1.4.8",
-         "resolved": "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.8.tgz",
-         "integrity": "sha512-zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw==",
+         "version": "1.4.11",
+         "resolved": "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.11.tgz",
+         "integrity": "sha512-FKvKIqRaykZtd4n47LbK/W/5fhQQ1X7cxxzG9A48h0BGN+S04NH7ervcCjM8tyR0lyGru83FAHSmw2ObgKoESg==",
         "dev": true
      },
      "node_modules/array-flatten": {
@@ -345,11 +349,11 @@
         }
      },
      "node_modules/check-disk-space": {
-         "version": "3.3.1",
-         "resolved": "https://registry.npmjs.org/check-disk-space/-/check-disk-space-3.3.1.tgz",
-         "integrity": "sha512-iOrT8yCZjSnyNZ43476FE2rnssvgw5hnuwOM0hm8Nj1qa0v4ieUUEbCyxxsEliaoDUb/75yCOL71zkDiDBLbMQ==",
+         "version": "3.4.0",
+         "resolved": "https://registry.npmjs.org/check-disk-space/-/check-disk-space-3.4.0.tgz",
+         "integrity": "sha512-drVkSqfwA+TvuEhFipiR1OC9boEGZL5RrWvVsOthdcvQNXyCCuKkEiTOTXZ7qxSf/GLwq4GvzfrQD/Wz325hgw==",
         "engines": {
-            "node": ">=12"
+            "node": ">=16"
         }
      },
      "node_modules/debug": {
@@ -486,9 +490,12 @@
         "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
      },
      "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/functions-have-names": {
         "version": "1.2.3",
@@ -531,12 +538,12 @@
         }
      },
      "node_modules/hap-nodejs": {
-         "version": "0.11.0",
-         "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.11.0.tgz",
-         "integrity": "sha512-ZKSc/DIECXH1vSlruv6tBVcO+LF/BDtjdVk7IIiAAS+KKjw9PylkXbtdU23mmLhM69BsWl9u+BuToAfkf0voSw==",
+         "version": "0.11.1",
+         "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.11.1.tgz",
+         "integrity": "sha512-hJuGyjng2jlzhZsviWCldaokT7l7BE3iGmWdlE6DNmQFDTmiBN3deNksAZ2nt7qp5jYEv7ZUvW7WBZqJsLh3ww==",
         "dependencies": {
            "@homebridge/ciao": "^1.1.5",
-            "@homebridge/dbus-native": "^0.5.0",
+            "@homebridge/dbus-native": "^0.5.1",
            "bonjour-hap": "~3.6.4",
            "debug": "^4.3.4",
            "fast-srp-hap": "~2.0.4",
@@ -856,9 +863,9 @@
         }
      },
      "node_modules/mkdirp": {
-         "version": "2.1.6",
-         "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
-         "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==",
+         "version": "3.0.1",
+         "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+         "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
         "bin": {
            "mkdirp": "dist/cjs/src/bin.js"
         },
@@ -1012,9 +1019,9 @@
         ]
      },
      "node_modules/sax": {
-         "version": "1.2.4",
-         "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-         "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+         "version": "1.3.0",
+         "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+         "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
      },
      "node_modules/side-channel": {
         "version": "1.0.4",
@@ -1097,6 +1104,12 @@
         "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
         "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
      },
+      "node_modules/undici-types": {
+         "version": "5.26.5",
+         "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+         "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+         "dev": true
+      },
      "node_modules/which-boxed-primitive": {
         "version": "1.0.2",
         "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -1146,9 +1159,9 @@
         }
      },
      "node_modules/xml2js": {
-         "version": "0.4.23",
-         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-         "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+         "version": "0.5.0",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+         "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
         "dependencies": {
            "sax": ">=0.6.0",
            "xmlbuilder": "~11.0.0"
@@ -1157,7 +1170,7 @@
            "node": ">=4.0.0"
         }
      },
-      "node_modules/xmlbuilder": {
+      "node_modules/xml2js/node_modules/xmlbuilder": {
         "version": "11.0.1",
         "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
         "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
@@ -1179,9 +1192,9 @@
         }
      },
      "@homebridge/dbus-native": {
-         "version": "0.5.0",
-         "resolved": "https://registry.npmjs.org/@homebridge/dbus-native/-/dbus-native-0.5.0.tgz",
-         "integrity": "sha512-ei0jyHE/uNDl/6D6heRwsqnESrrXuSlfp+xlwGfg3mo1OqhKvyb/Kp73uxQyOJ3f1T1ocLSyA5uzoR1AbfaXIQ==",
+         "version": "0.5.1",
+         "resolved": "https://registry.npmjs.org/@homebridge/dbus-native/-/dbus-native-0.5.1.tgz",
+         "integrity": "sha512-7xXz3R1W/kcbfQOGp32y4K7etqtowICR1vpx8j85KwPYXbNQrgiZ3zcwDYgDGBWq3FD9xzsW7h4YWJ4vTR2seQ==",
         "requires": {
            "@homebridge/long": "^5.2.1",
            "@homebridge/put": "~0.0.8",
@@ -1189,7 +1202,7 @@
            "hexy": "^0.2.10",
            "minimist": "^1.2.6",
            "safe-buffer": "^5.1.1",
-            "xml2js": "^0.4.17"
+            "xml2js": "^0.5.0"
         }
      },
      "@homebridge/long": {
@@ -1205,25 +1218,26 @@
      "@koush/werift-src": {
         "version": "file:../../external/werift",
         "requires": {
-            "@types/jest": "^29.2.4",
-            "@types/node": "^18.11.18",
-            "@typescript-eslint/eslint-plugin": "^5.47.1",
-            "@typescript-eslint/parser": "^5.47.1",
-            "eslint": "^8.30.0",
-            "eslint-config-prettier": "^8.5.0",
-            "eslint-plugin-prettier": "^4.2.1",
-            "eslint-plugin-simple-import-sort": "^8.0.0",
-            "jest": "^29.3.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",
+            "jest": "^29.7.0",
+            "knip": "^3.7.0",
            "node-actionlint": "^1.2.2",
            "organize-imports-cli": "^0.10.0",
-            "prettier": "^2.8.1",
+            "prettier": "^3.1.1",
            "process": "^0.11.10",
-            "ts-jest": "^29.0.3",
-            "ts-node": "^10.9.1",
+            "ts-jest": "^29.1.1",
+            "ts-node": "^10.9.2",
            "ts-node-dev": "^2.0.0",
-            "typedoc": "^0.23.23",
-            "typedoc-plugin-markdown": "^3.14.0",
-            "typescript": "^4.9.4"
+            "typedoc": "0.25.4",
+            "typedoc-plugin-markdown": "3.17.1",
+            "typescript": "5.0.4"
         }
      },
      "@leichtgewicht/ip-codec": {
@@ -1236,10 +1250,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": {
@@ -1249,7 +1263,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",
@@ -1267,18 +1281,18 @@
         }
      },
      "@types/debug": {
-         "version": "4.1.7",
-         "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz",
-         "integrity": "sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==",
+         "version": "4.1.12",
+         "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+         "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
         "dev": true,
         "requires": {
            "@types/ms": "*"
         }
      },
      "@types/lodash": {
-         "version": "4.14.192",
-         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.192.tgz",
-         "integrity": "sha512-km+Vyn3BYm5ytMO13k9KTp27O75rbQ0NFw+U//g+PX7VZyjCioXaRFisqSIJRECljcTv73G3i6BpglNGHgUQ5A==",
+         "version": "4.14.202",
+         "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.202.tgz",
+         "integrity": "sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==",
         "dev": true
      },
      "@types/ms": {
@@ -1288,15 +1302,18 @@
         "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==",
-         "dev": true
+         "version": "20.11.0",
+         "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz",
+         "integrity": "sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==",
+         "dev": true,
+         "requires": {
+            "undici-types": "~5.26.4"
+         }
      },
      "@types/url-parse": {
-         "version": "1.4.8",
-         "resolved": "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.8.tgz",
-         "integrity": "sha512-zqqcGKyNWgTLFBxmaexGUKQyWqeG7HjXj20EuQJSJWwXe54BjX0ihIo5cJB9yAQzH8dNugJ9GvkBYMjPXs/PJw==",
+         "version": "1.4.11",
+         "resolved": "https://registry.npmjs.org/@types/url-parse/-/url-parse-1.4.11.tgz",
+         "integrity": "sha512-FKvKIqRaykZtd4n47LbK/W/5fhQQ1X7cxxzG9A48h0BGN+S04NH7ervcCjM8tyR0lyGru83FAHSmw2ObgKoESg==",
         "dev": true
      },
      "array-flatten": {
@@ -1336,9 +1353,9 @@
         }
      },
      "check-disk-space": {
-         "version": "3.3.1",
-         "resolved": "https://registry.npmjs.org/check-disk-space/-/check-disk-space-3.3.1.tgz",
-         "integrity": "sha512-iOrT8yCZjSnyNZ43476FE2rnssvgw5hnuwOM0hm8Nj1qa0v4ieUUEbCyxxsEliaoDUb/75yCOL71zkDiDBLbMQ=="
+         "version": "3.4.0",
+         "resolved": "https://registry.npmjs.org/check-disk-space/-/check-disk-space-3.4.0.tgz",
+         "integrity": "sha512-drVkSqfwA+TvuEhFipiR1OC9boEGZL5RrWvVsOthdcvQNXyCCuKkEiTOTXZ7qxSf/GLwq4GvzfrQD/Wz325hgw=="
      },
      "debug": {
         "version": "4.3.4",
@@ -1448,9 +1465,9 @@
         "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
      },
      "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=="
      },
      "functions-have-names": {
         "version": "1.2.3",
@@ -1481,12 +1498,12 @@
         }
      },
      "hap-nodejs": {
-         "version": "0.11.0",
-         "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.11.0.tgz",
-         "integrity": "sha512-ZKSc/DIECXH1vSlruv6tBVcO+LF/BDtjdVk7IIiAAS+KKjw9PylkXbtdU23mmLhM69BsWl9u+BuToAfkf0voSw==",
+         "version": "0.11.1",
+         "resolved": "https://registry.npmjs.org/hap-nodejs/-/hap-nodejs-0.11.1.tgz",
+         "integrity": "sha512-hJuGyjng2jlzhZsviWCldaokT7l7BE3iGmWdlE6DNmQFDTmiBN3deNksAZ2nt7qp5jYEv7ZUvW7WBZqJsLh3ww==",
         "requires": {
            "@homebridge/ciao": "^1.1.5",
-            "@homebridge/dbus-native": "^0.5.0",
+            "@homebridge/dbus-native": "^0.5.1",
            "bonjour-hap": "~3.6.4",
            "debug": "^4.3.4",
            "fast-srp-hap": "~2.0.4",
@@ -1698,9 +1715,9 @@
         "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="
      },
      "mkdirp": {
-         "version": "2.1.6",
-         "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.6.tgz",
-         "integrity": "sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A=="
+         "version": "3.0.1",
+         "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+         "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg=="
      },
      "ms": {
         "version": "2.1.2",
@@ -1799,9 +1816,9 @@
         "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
      },
      "sax": {
-         "version": "1.2.4",
-         "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-         "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+         "version": "1.3.0",
+         "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
+         "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
      },
      "side-channel": {
         "version": "1.0.4",
@@ -1872,6 +1889,12 @@
         "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
         "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="
      },
+      "undici-types": {
+         "version": "5.26.5",
+         "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+         "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+         "dev": true
+      },
      "which-boxed-primitive": {
         "version": "1.0.2",
         "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
@@ -1909,18 +1932,20 @@
         }
      },
      "xml2js": {
-         "version": "0.4.23",
-         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-         "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+         "version": "0.5.0",
+         "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
+         "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
         "requires": {
            "sax": ">=0.6.0",
            "xmlbuilder": "~11.0.0"
+         },
+         "dependencies": {
+            "xmlbuilder": {
+               "version": "11.0.1",
+               "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+               "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+            }
         }
-      },
-      "xmlbuilder": {
-         "version": "11.0.1",
-         "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-         "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
      }
   }
 }
--- a/plugins/homekit/package.json
+++ b/plugins/homekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/homekit",
-   "version": "1.2.34",
+   "version": "1.2.36",
   "description": "HomeKit Plugin for Scrypted",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
@@ -35,17 +35,17 @@
   },
   "dependencies": {
      "@koush/werift-src": "file:../../external/werift",
-      "check-disk-space": "^3.3.1",
-      "hap-nodejs": "^0.11.0",
+      "check-disk-space": "^3.4.0",
+      "hap-nodejs": "^0.11.1",
      "lodash": "^4.17.21",
-      "mkdirp": "^2.1.6"
+      "mkdirp": "^3.0.1"
   },
   "devDependencies": {
      "@scrypted/common": "file:../../common",
      "@scrypted/sdk": "file:../../sdk",
-      "@types/debug": "^4.1.7",
-      "@types/lodash": "^4.14.192",
-      "@types/node": "^18.15.11",
-      "@types/url-parse": "^1.4.8"
+      "@types/debug": "^4.1.12",
+      "@types/lodash": "^4.14.202",
+      "@types/node": "^20.11.0",
+      "@types/url-parse": "^1.4.11"
   }
 }
--- a/plugins/homekit/src/types/camera/camera-recording-files.ts
+++ b/plugins/homekit/src/types/camera/camera-recording-files.ts
@@ -1,8 +1,8 @@

 import sdk, { FFmpegInput, MediaObject, VideoClip, VideoClipOptions } from '@scrypted/sdk';
-import path from 'path';
 import fs from 'fs';
-import mkdirp from 'mkdirp';
+import { mkdirp } from 'mkdirp';
+import path from 'path';

 const { mediaManager } = sdk;
 export const VIDEO_CLIPS_NATIVE_ID = 'save-video-clips';
@@ -98,16 +98,6 @@ export async function getVideoClips(options?: VideoClipOptions, id?: string): Pr
    if (options?.endTime)
        ret = ret.filter(clip => clip.startTime + clip.duration < options.endTime);

-    if (options?.reverseOrder)
-        ret = ret.reverse();
-
-    if (options?.startId) {
-        const startIndex = ret.findIndex(c => c.id === options.startId);
-        if (startIndex === -1)
-            throw new Error('startIndex not found');
-        ret = ret.slice(startIndex);
-    }
-
    if (options?.count)
        ret = ret.slice(0, options.count);

--- a/plugins/homekit/src/types/camera/camera-recording.ts
+++ b/plugins/homekit/src/types/camera/camera-recording.ts
@@ -7,17 +7,17 @@ import { timeoutPromise } from "@scrypted/common/src/promise-utils";
 import sdk, { AudioSensor, FFmpegInput, MotionSensor, ScryptedDevice, ScryptedInterface, ScryptedMimeTypes, VideoCamera } from '@scrypted/sdk';
 import child_process from "child_process";
 import fs from 'fs';
-import mkdirp from 'mkdirp';
+import { mkdirp } from 'mkdirp';
 import net from 'net';
+import path from 'path';
 import { Duplex, Readable, Writable } from 'stream';
 import { } from '../../common';
-import { AudioRecordingCodecType, CameraRecordingConfiguration, DataStreamConnection, RecordingPacket } from '../../hap';
+import { AudioRecordingCodecType, CameraRecordingConfiguration, RecordingPacket } from '../../hap';
 import type { HomeKitPlugin } from "../../main";
-import { getCameraRecordingFiles, HksvVideoClip, VIDEO_CLIPS_NATIVE_ID } from './camera-recording-files';
-import { checkCompatibleCodec, FORCE_OPUS, transcodingDebugModeWarning } from './camera-utils';
-import { NAL_TYPE_DELIMITER, NAL_TYPE_FU_A, NAL_TYPE_IDR, NAL_TYPE_PPS, NAL_TYPE_SEI, NAL_TYPE_SPS, NAL_TYPE_STAP_A } from "./h264-packetizer";
-import path from 'path';
 import { getDebugMode } from "./camera-debug-mode-storage";
+import { HksvVideoClip, VIDEO_CLIPS_NATIVE_ID, getCameraRecordingFiles } from './camera-recording-files';
+import { FORCE_OPUS, checkCompatibleCodec, transcodingDebugModeWarning } from './camera-utils';
+import { NAL_TYPE_DELIMITER, NAL_TYPE_FU_A, NAL_TYPE_IDR, NAL_TYPE_PPS, NAL_TYPE_SEI, NAL_TYPE_SPS, NAL_TYPE_STAP_A } from "./h264-packetizer";

 const { log, mediaManager, deviceManager } = sdk;

--- a/plugins/onvif/package-lock.json
+++ b/plugins/onvif/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/onvif",
-   "version": "0.1.7",
+   "version": "0.1.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/onvif",
-         "version": "0.1.7",
+         "version": "0.1.8",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/onvif/package.json
+++ b/plugins/onvif/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/onvif",
-   "version": "0.1.7",
+   "version": "0.1.8",
   "description": "ONVIF Camera Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/onvif/src/main.ts
+++ b/plugins/onvif/src/main.ts
@@ -492,7 +492,7 @@ class OnvifProvider extends RtspProvider implements DeviceDiscovery {

        const username = settings.username?.toString();
        const password = settings.password?.toString();
-        const skipValidate = settings.skipValidate === 'true';
+        const skipValidate = settings.skipValidate?.toString() === 'true';
        let ptzCapabilities: string[];
        if (!skipValidate) {
            try {
--- a/plugins/reolink/package-lock.json
+++ b/plugins/reolink/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/reolink",
-   "version": "0.0.57",
+   "version": "0.0.58",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/reolink",
-         "version": "0.0.57",
+         "version": "0.0.58",
         "license": "Apache",
         "dependencies": {
            "@scrypted/common": "file:../../common",
--- a/plugins/reolink/package.json
+++ b/plugins/reolink/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/reolink",
-   "version": "0.0.57",
+   "version": "0.0.58",
   "description": "Reolink Plugin for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/snapshot/package-lock.json
+++ b/plugins/snapshot/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/snapshot",
-   "version": "0.2.33",
+   "version": "0.2.34",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/snapshot",
-         "version": "0.2.33",
+         "version": "0.2.34",
         "dependencies": {
            "@types/node": "^20.10.6",
            "sharp": "^0.33.1",
--- a/plugins/snapshot/package.json
+++ b/plugins/snapshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/snapshot",
-   "version": "0.2.33",
+   "version": "0.2.34",
   "description": "Snapshot Plugin for Scrypted",
   "scripts": {
      "scrypted-setup-project": "scrypted-setup-project",
--- a/plugins/snapshot/src/main.ts
+++ b/plugins/snapshot/src/main.ts
@@ -1,6 +1,6 @@
 import { AutoenableMixinProvider } from "@scrypted/common/src/autoenable-mixin-provider";
 import { AuthFetchCredentialState, authHttpFetch } from '@scrypted/common/src/http-auth-fetch';
-import { RefreshPromise, TimeoutError, createMapPromiseDebouncer, singletonPromise } from "@scrypted/common/src/promise-utils";
+import { RefreshPromise, TimeoutError, createMapPromiseDebouncer, singletonPromise, timeoutPromise } from "@scrypted/common/src/promise-utils";
 import { SettingsMixinDeviceBase, SettingsMixinDeviceOptions } from "@scrypted/common/src/settings-mixin";
 import sdk, { BufferConverter, Camera, DeviceManifest, DeviceProvider, FFmpegInput, HttpRequest, HttpRequestHandler, HttpResponse, MediaObject, MediaObjectOptions, MixinProvider, RequestMediaStreamOptions, RequestPictureOptions, ResponsePictureOptions, ScryptedDevice, ScryptedDeviceType, ScryptedInterface, ScryptedMimeTypes, Setting, SettingValue, Settings, VideoCamera } from "@scrypted/sdk";
 import { StorageSettings } from "@scrypted/sdk/storage-settings";
@@ -288,8 +288,14 @@ class SnapshotMixin extends SettingsMixinDeviceBase<Camera> implements Camera {
            // periodic snapshot should get the immediately available picture.
            // the debounce has already triggered a refresh for the next go around.
            if (periodicSnapshot && this.currentPicture) {
+                const cp = this.currentPicture;
                debounced.catch(() => {});
-                picture = this.currentPicture;
+                try {
+                    picture = await timeoutPromise(1000, debounced);
+                }
+                catch (e) {
+                    picture = cp;
+                }
            }
            else {
                picture = await debounced;
--- a/plugins/zwave/.vscode/settings.json
+++ b/plugins/zwave/.vscode/settings.json
@@ -1,4 +1,4 @@

 {
-    "scrypted.debugHost": "koushik-ubuntu",
+    "scrypted.debugHost": "scrypted-server",
 }
--- a/plugins/zwave/package-lock.json
+++ b/plugins/zwave/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@scrypted/zwave",
-   "version": "0.1.2",
+   "version": "0.1.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
      "": {
         "name": "@scrypted/zwave",
-         "version": "0.1.2",
+         "version": "0.1.5",
         "license": "Apache",
         "dependencies": {
            "@scrypted/sdk": "file:../../sdk",
--- a/plugins/zwave/package.json
+++ b/plugins/zwave/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@scrypted/zwave",
-   "version": "0.1.2",
+   "version": "0.1.5",
   "description": "Z-Wave USB Controller for Scrypted",
   "author": "Scrypted",
   "license": "Apache",
--- a/plugins/zwave/src/CommandClasses/SmokeAlarmToBinarySensor.ts
+++ b/plugins/zwave/src/CommandClasses/SmokeAlarmToBinarySensor.ts
@@ -0,0 +1,22 @@
+import { CO2Sensor } from "@scrypted/sdk";
+import type { ValueID } from "@zwave-js/core";
+import { ZWaveNode, ZWaveNodeValueUpdatedArgs } from "zwave-js";
+import { Notification } from "./Notification";
+import { ZwaveDeviceBase } from "./ZwaveDeviceBase";
+
+export class SmokeAlarmToCO2Sensor extends Notification implements CO2Sensor {
+  static getInterfaces(node: ZWaveNode, valueId: ValueID): string[] {
+    if (Notification.checkInterface(node, valueId, 'Smoke detected')
+      || Notification.checkInterface(node, valueId, 'Smoke detected (location provided)')) {
+      return ['CO2Sensor'];
+    }
+    return null;
+  }
+
+  static onValueChanged(zwaveDevice: ZwaveDeviceBase, valueId: ZWaveNodeValueUpdatedArgs) {
+    if (valueId.propertyKey === 'Alarm status') {
+      const notification = Notification.lookupNotification(zwaveDevice, 'Smoke Alarm');
+      zwaveDevice.co2ppm = notification.lookupValue(valueId.newValue as number) ? 50 : 0;
+    }
+  }
+}
--- a/plugins/zwave/src/CommandClasses/ZwaveDeviceBase.ts
+++ b/plugins/zwave/src/CommandClasses/ZwaveDeviceBase.ts
@@ -65,6 +65,7 @@ export class ZwaveDeviceBase extends ScryptedDeviceBase implements Refresh, Sett
    }

    onValueChanged(valueId: ZWaveNodeValueUpdatedArgs) {
+        this.console.log('value changed', valueId);
        var cc = getCommandClassIndex(valueId.commandClass, valueId.property as number);
        if (!cc) {
            cc = getCommandClass(valueId.commandClass);
--- a/plugins/zwave/src/CommandClasses/index.ts
+++ b/plugins/zwave/src/CommandClasses/index.ts
@@ -1,26 +1,26 @@
-import OnOffToSwitch from './OnOffToSwitch';
-import BrightnessToSwitchMultilevel from './BrightnessToSwitchMultilevel';
-import { CommandClassHandler as CommandClassHandlerClass } from './ZwaveDeviceBase';
-import BinarySensorToStateSensor from './BinarySensorToStateSensor';
-import LockToDoorLock from './LockToDoorLock';
-import BatteryToBattery from './BatteryToBattery';
-import ThermometerToSensorMultilevel from './ThermometerToSensorMultilevel';
-import HumidityToSensorMultilevel from './HumiditySensorToSensorMultilevel';
-import LuminanceSensorToSensorMultilevel from './LuminanceSensorToSensorMultilevel';
-import UltravioletSensorMultilevel from './UltravioletSensorToSensorMultilevel';
-import SettingsToConfiguration from './SettingsToConfiguration';
-import EntryToBarrierOperator from './EntryToBarrierOperator';
-import EntrySensorToBarriorOperator from './EntrySensorToBarrierOperator';
-import ColorSettingRgbToColor from './ColorSettingRgbToColor';
-import { NotificationType } from './Notification';
-import { EntrySensorToAccessControl } from './EntrySensorToAccessControl';
-import { FloodSensorToWaterAlarm } from './FloodSensorToWaterAlarm';
-import { PasswordStoreToUserCode } from './PasswordStoreToUserCode';
-import { TamperSensorToHomeSecurity } from './TamperSensorToHomeSecurity';
-import { PowerSensorToPowerManagement } from './PowerSensorToPowerManagement';
-import { ZWaveNode } from 'zwave-js';
-import {CommandClasses, ValueID} from '@zwave-js/core'
 import { ScryptedInterface } from '@scrypted/sdk';
+import { CommandClasses, ValueID } from '@zwave-js/core';
+import { ZWaveNode } from 'zwave-js';
+import BatteryToBattery from './BatteryToBattery';
+import BinarySensorToStateSensor from './BinarySensorToStateSensor';
+import BrightnessToSwitchMultilevel from './BrightnessToSwitchMultilevel';
+import ColorSettingRgbToColor from './ColorSettingRgbToColor';
+import { EntrySensorToAccessControl } from './EntrySensorToAccessControl';
+import EntrySensorToBarriorOperator from './EntrySensorToBarrierOperator';
+import EntryToBarrierOperator from './EntryToBarrierOperator';
+import { FloodSensorToWaterAlarm } from './FloodSensorToWaterAlarm';
+import HumidityToSensorMultilevel from './HumiditySensorToSensorMultilevel';
+import LockToDoorLock from './LockToDoorLock';
+import LuminanceSensorToSensorMultilevel from './LuminanceSensorToSensorMultilevel';
+import OnOffToSwitch from './OnOffToSwitch';
+import { PasswordStoreToUserCode } from './PasswordStoreToUserCode';
+import { PowerSensorToPowerManagement } from './PowerSensorToPowerManagement';
+import SettingsToConfiguration from './SettingsToConfiguration';
+import { SmokeAlarmToCO2Sensor } from './SmokeAlarmToBinarySensor';
+import { TamperSensorToHomeSecurity } from './TamperSensorToHomeSecurity';
+import ThermometerToSensorMultilevel from './ThermometerToSensorMultilevel';
+import UltravioletSensorMultilevel from './UltravioletSensorToSensorMultilevel';
+import { CommandClassHandler as CommandClassHandlerClass } from './ZwaveDeviceBase';

 var CommandClassMap: {[ccId: string]: CommandClassInfo} = {};

@@ -72,25 +72,26 @@ export function getCommandClassIndex(commandClass: number, index: number): Comma
    return CommandClassMap[`${commandClass}#${index}`];
 }

-addCommandClassIndex(CommandClasses['Binary Switch'], 'currentValue', OnOffToSwitch, 'OnOff');
-addCommandClassIndex(CommandClasses['Multilevel Switch'], 'currentValue', BrightnessToSwitchMultilevel, 'Brightness', 'OnOff');
-addCommandClassIndex(CommandClasses['Color'], 'currentValue', ColorSettingRgbToColor, 'ColorSettingRgb', 'ColorSettingTemperature');
-addCommandClassIndex(CommandClasses['Binary Sensor'], 'Any', BinarySensorToStateSensor, 'BinarySensor');
-addCommandClassIndex(CommandClasses['Door Lock'], 'currentMode', LockToDoorLock, 'Lock');
-addCommandClassIndex(CommandClasses['Battery'], 'level', BatteryToBattery, 'Battery');
-addCommandClassIndex(CommandClasses['Entry Control'], 'currentValue', EntryToBarrierOperator, 'Entry');
-addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Air temperature', ThermometerToSensorMultilevel, 'Thermometer');
-addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Humidity', HumidityToSensorMultilevel, 'HumiditySensor');
-addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Illuminance', LuminanceSensorToSensorMultilevel, 'LuminanceSensor');
-addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Ultraviolet', UltravioletSensorMultilevel, 'UltravioletSensor');
+addCommandClassIndex(CommandClasses['Binary Switch'], 'currentValue', OnOffToSwitch, ScryptedInterface.OnOff);
+addCommandClassIndex(CommandClasses['Multilevel Switch'], 'currentValue', BrightnessToSwitchMultilevel, ScryptedInterface.Brightness, ScryptedInterface.OnOff);
+addCommandClassIndex(CommandClasses['Color'], 'currentValue', ColorSettingRgbToColor, ScryptedInterface.ColorSettingRgb, ScryptedInterface.ColorSettingTemperature);
+addCommandClassIndex(CommandClasses['Binary Sensor'], 'Any', BinarySensorToStateSensor, ScryptedInterface.BinarySensor);
+addCommandClassIndex(CommandClasses['Door Lock'], 'currentMode', LockToDoorLock, ScryptedInterface.Lock);
+addCommandClassIndex(CommandClasses['Battery'], 'level', BatteryToBattery, ScryptedInterface.Battery);
+addCommandClassIndex(CommandClasses['Entry Control'], 'currentValue', EntryToBarrierOperator, ScryptedInterface.Entry);
+addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Air temperature', ThermometerToSensorMultilevel, ScryptedInterface.Thermometer);
+addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Humidity', HumidityToSensorMultilevel, ScryptedInterface.HumiditySensor);
+addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Illuminance', LuminanceSensorToSensorMultilevel, ScryptedInterface.LuminanceSensor);
+addCommandClassIndex(CommandClasses['Multilevel Sensor'], 'Ultraviolet', UltravioletSensorMultilevel, ScryptedInterface.UltravioletSensor);

-addCommandClassIndex(CommandClasses['Notification'], 'Access Control', EntrySensorToAccessControl, 'EntrySensor');
-addCommandClassIndex(CommandClasses['Notification'], 'Water Alarm', FloodSensorToWaterAlarm, 'FloodSensor');
+addCommandClassIndex(CommandClasses['Notification'], 'Access Control', EntrySensorToAccessControl, ScryptedInterface.EntrySensor);
+addCommandClassIndex(CommandClasses['Notification'], 'Water Alarm', FloodSensorToWaterAlarm, ScryptedInterface.FloodSensor);
 addCommandClassIndex(CommandClasses['Notification'], 'Home Security', TamperSensorToHomeSecurity, ScryptedInterface.TamperSensor);
-addCommandClassIndex(CommandClasses['Notification'], 'Power Management', PowerSensorToPowerManagement, 'PowerSensor');
+addCommandClassIndex(CommandClasses['Notification'], 'Power Management', PowerSensorToPowerManagement, ScryptedInterface.PowerSensor);
+addCommandClassIndex(CommandClasses['Notification'], 'Smoke Alarm', SmokeAlarmToCO2Sensor, ScryptedInterface.CO2Sensor);

-addCommandClassIndex(CommandClasses['Barrier Operator'], 'currentState', EntryToBarrierOperator, 'Entry');
-addCommandClassIndex(CommandClasses['Barrier Operator'], 'position', EntrySensorToBarriorOperator, 'EntrySensor');
+addCommandClassIndex(CommandClasses['Barrier Operator'], 'currentState', EntryToBarrierOperator, ScryptedInterface.Entry);
+addCommandClassIndex(CommandClasses['Barrier Operator'], 'position', EntrySensorToBarriorOperator, ScryptedInterface.EntrySensor);

-addCommandClass(CommandClasses['Configuration'], SettingsToConfiguration, 'Settings');
-addCommandClass(CommandClasses['User Code'], PasswordStoreToUserCode, 'PasswordStore');
+addCommandClass(CommandClasses['Configuration'], SettingsToConfiguration, ScryptedInterface.Settings);
+addCommandClass(CommandClasses['User Code'], PasswordStoreToUserCode, ScryptedInterface.PasswordStore);
--- a/server/.vscode/launch.json
+++ b/server/.vscode/launch.json
@@ -27,6 +27,7 @@
                "${workspaceFolder}/**/*.js"
            ],
            "env": {
+                "SCRYPTED_CAN_RESTART": "true",
                // "SCRYPTED_DEFAULT_AUTHENTICATION": "demo"
                // force usage of system python because brew python is 3.11
                // which has no wheels for coreml tools or tflite-runtime
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@scrypted/server",
-  "version": "0.82.0",
+  "version": "0.87.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@scrypted/server",
-      "version": "0.82.0",
+      "version": "0.87.0",
      "license": "ISC",
      "dependencies": {
        "@mapbox/node-pre-gyp": "^1.0.11",
@@ -14,25 +14,21 @@
        "adm-zip": "^0.5.10",
        "body-parser": "^1.20.2",
        "cookie-parser": "^1.4.6",
-        "debug": "^4.3.4",
        "engine.io": "^6.5.4",
        "express": "^4.18.2",
        "ffmpeg-static": "^5.2.0",
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.5",
        "http-auth": "^4.2.0",
        "ip": "^1.1.8",
        "level": "^8.0.0",
-        "linkfs": "^2.1.0",
        "lodash": "^4.17.21",
-        "memfs": "^4.6.0",
-        "mime": "^3.0.0",
        "nan": "^2.18.0",
        "node-dijkstra": "^2.5.0",
        "node-forge": "^1.3.1",
        "node-gyp": "^10.0.1",
        "router": "^1.3.8",
        "semver": "^7.5.4",
-        "sharp": "^0.33.1",
+        "sharp": "^0.33.2",
        "source-map-support": "^0.5.21",
        "tar": "^6.2.0",
        "tslib": "^2.6.2",
@@ -46,16 +42,13 @@
      "devDependencies": {
        "@types/adm-zip": "^0.5.5",
        "@types/cookie-parser": "^1.4.6",
-        "@types/debug": "^4.1.12",
        "@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/node-dijkstra": "^2.5.6",
-        "@types/node-forge": "^1.3.10",
-        "@types/pem": "^1.14.4",
+        "@types/node-forge": "^1.3.11",
        "@types/semver": "^7.5.6",
        "@types/source-map-support": "^0.5.10",
        "@types/tar": "^6.1.10",
@@ -81,18 +74,18 @@
      }
    },
    "node_modules/@emnapi/runtime": {
-      "version": "0.44.0",
-      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.44.0.tgz",
-      "integrity": "sha512-ZX/etZEZw8DR7zAB1eVQT40lNo0jeqpb6dCgOvctB6FIQ5PoXfMuNY8+ayQfu8tNQbAB8gQWSSJupR8NxeiZXw==",
+      "version": "0.45.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-0.45.0.tgz",
+      "integrity": "sha512-Txumi3td7J4A/xTTwlssKieHKTGl3j4A1tglBx72auZ49YK7ePY6XZricgIg9mnZT4xPfA+UPCUdnhRuEFDL+w==",
      "optional": true,
      "dependencies": {
        "tslib": "^2.4.0"
      }
    },
    "node_modules/@img/sharp-darwin-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.1.tgz",
-      "integrity": "sha512-esr2BZ1x0bo+wl7Gx2hjssYhjrhUsD88VQulI0FrG8/otRQUOxLWHMBd1Y1qo2Gfg2KUvXNpT0ASnV9BzJCexw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.2.tgz",
+      "integrity": "sha512-itHBs1rPmsmGF9p4qRe++CzCgd+kFYktnsoR1sbIAfsRMrJZau0Tt1AH9KVnufc2/tU02Gf6Ibujx+15qRE03w==",
      "cpu": [
        "arm64"
      ],
@@ -111,13 +104,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-arm64": "1.0.0"
+        "@img/sharp-libvips-darwin-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-darwin-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.1.tgz",
-      "integrity": "sha512-YrnuB3bXuWdG+hJlXtq7C73lF8ampkhU3tMxg5Hh+E7ikxbUVOU9nlNtVTloDXz6pRHt2y2oKJq7DY/yt+UXYw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.2.tgz",
+      "integrity": "sha512-/rK/69Rrp9x5kaWBjVN07KixZanRr+W1OiyKdXcbjQD6KbW+obaTeBBtLUAtbBsnlTTmWthw99xqoOS7SsySDg==",
      "cpu": [
        "x64"
      ],
@@ -136,13 +129,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-darwin-x64": "1.0.0"
+        "@img/sharp-libvips-darwin-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-libvips-darwin-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.0.tgz",
-      "integrity": "sha512-VzYd6OwnUR81sInf3alj1wiokY50DjsHz5bvfnsFpxs5tqQxESoHtJO6xyksDs3RIkyhMWq2FufXo6GNSU9BMw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.1.tgz",
+      "integrity": "sha512-kQyrSNd6lmBV7O0BUiyu/OEw9yeNGFbQhbxswS1i6rMDwBBSX+e+rPzu3S+MwAiGU3HdLze3PanQ4Xkfemgzcw==",
      "cpu": [
        "arm64"
      ],
@@ -161,9 +154,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-darwin-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.0.tgz",
-      "integrity": "sha512-dD9OznTlHD6aovRswaPNEy8dKtSAmNo4++tO7uuR4o5VxbVAOoEQ1uSmN4iFAdQneTHws1lkTZeiXPrcCkh6IA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.1.tgz",
+      "integrity": "sha512-eVU/JYLPVjhhrd8Tk6gosl5pVlvsqiFlt50wotCvdkFGf+mDNBJxMh+bvav+Wt3EBnNZWq8Sp2I7XfSjm8siog==",
      "cpu": [
        "x64"
      ],
@@ -182,9 +175,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-arm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.0.tgz",
-      "integrity": "sha512-VwgD2eEikDJUk09Mn9Dzi1OW2OJFRQK+XlBTkUNmAWPrtj8Ly0yq05DFgu1VCMx2/DqCGQVi5A1dM9hTmxf3uw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.1.tgz",
+      "integrity": "sha512-FtdMvR4R99FTsD53IA3LxYGghQ82t3yt0ZQ93WMZ2xV3dqrb0E8zq4VHaTOuLEAuA83oDawHV3fd+BsAPadHIQ==",
      "cpu": [
        "arm"
      ],
@@ -203,9 +196,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.0.tgz",
-      "integrity": "sha512-xTYThiqEZEZc0PRU90yVtM3KE7lw1bKdnDQ9kCTHWbqWyHOe4NpPOtMGy27YnN51q0J5dqRrvicfPbALIOeAZA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.1.tgz",
+      "integrity": "sha512-bnGG+MJjdX70mAQcSLxgeJco11G+MxTz+ebxlz8Y3dxyeb3Nkl7LgLI0mXupoO+u1wRNx/iRj5yHtzA4sde1yA==",
      "cpu": [
        "arm64"
      ],
@@ -224,9 +217,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-s390x": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.0.tgz",
-      "integrity": "sha512-o9E46WWBC6JsBlwU4QyU9578G77HBDT1NInd+aERfxeOPbk0qBZHgoDsQmA2v9TbqJRWzoBPx1aLOhprBMgPjw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.1.tgz",
+      "integrity": "sha512-3+rzfAR1YpMOeA2zZNp+aYEzGNWK4zF3+sdMxuCS3ey9HhDbJ66w6hDSHDMoap32DueFwhhs3vwooAB2MaK4XQ==",
      "cpu": [
        "s390x"
      ],
@@ -245,9 +238,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linux-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.0.tgz",
-      "integrity": "sha512-naldaJy4hSVhWBgEjfdBY85CAa4UO+W1nx6a1sWStHZ7EUfNiuBTTN2KUYT5dH1+p/xij1t2QSXfCiFJoC5S/Q==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.1.tgz",
+      "integrity": "sha512-3NR1mxFsaSgMMzz1bAnnKbSAI+lHXVTqAHgc1bgzjHuXjo4hlscpUxc0vFSAPKI3yuzdzcZOkq7nDPrP2F8Jgw==",
      "cpu": [
        "x64"
      ],
@@ -266,9 +259,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linuxmusl-arm64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.0.tgz",
-      "integrity": "sha512-OdorplCyvmSAPsoJLldtLh3nLxRrkAAAOHsGWGDYfN0kh730gifK+UZb3dWORRa6EusNqCTjfXV4GxvgJ/nPDQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.1.tgz",
+      "integrity": "sha512-5aBRcjHDG/T6jwC3Edl3lP8nl9U2Yo8+oTl5drd1dh9Z1EBfzUKAJFUDTDisDjUwc7N4AjnPGfCA3jl3hY8uDg==",
      "cpu": [
        "arm64"
      ],
@@ -287,9 +280,9 @@
      }
    },
    "node_modules/@img/sharp-libvips-linuxmusl-x64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.0.tgz",
-      "integrity": "sha512-FW8iK6rJrg+X2jKD0Ajhjv6y74lToIBEvkZhl42nZt563FfxkCYacrXZtd+q/sRQDypQLzY5WdLkVTbJoPyqNg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.1.tgz",
+      "integrity": "sha512-dcT7inI9DBFK6ovfeWRe3hG30h51cBAP5JXlZfx6pzc/Mnf9HFCQDLtYf4MCBjxaaTfjCCjkBxcy3XzOAo5txw==",
      "cpu": [
        "x64"
      ],
@@ -308,9 +301,9 @@
      }
    },
    "node_modules/@img/sharp-linux-arm": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.1.tgz",
-      "integrity": "sha512-Ii4X1vnzzI4j0+cucsrYA5ctrzU9ciXERfJR633S2r39CiD8npqH2GMj63uFZRCFt3E687IenAdbwIpQOJ5BNA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.2.tgz",
+      "integrity": "sha512-Fndk/4Zq3vAc4G/qyfXASbS3HBZbKrlnKZLEJzPLrXoJuipFNNwTes71+Ki1hwYW5lch26niRYoZFAtZVf3EGA==",
      "cpu": [
        "arm"
      ],
@@ -329,13 +322,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm": "1.0.0"
+        "@img/sharp-libvips-linux-arm": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.1.tgz",
-      "integrity": "sha512-59B5GRO2d5N3tIfeGHAbJps7cLpuWEQv/8ySd9109ohQ3kzyCACENkFVAnGPX00HwPTQcaBNF7HQYEfZyZUFfw==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.2.tgz",
+      "integrity": "sha512-pz0NNo882vVfqJ0yNInuG9YH71smP4gRSdeL09ukC2YLE6ZyZePAlWKEHgAzJGTiOh8Qkaov6mMIMlEhmLdKew==",
      "cpu": [
        "arm64"
      ],
@@ -354,13 +347,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-arm64": "1.0.0"
+        "@img/sharp-libvips-linux-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-s390x": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.1.tgz",
-      "integrity": "sha512-tRGrb2pHnFUXpOAj84orYNxHADBDIr0J7rrjwQrTNMQMWA4zy3StKmMvwsI7u3dEZcgwuMMooIIGWEWOjnmG8A==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.2.tgz",
+      "integrity": "sha512-MBoInDXDppMfhSzbMmOQtGfloVAflS2rP1qPcUIiITMi36Mm5YR7r0ASND99razjQUpHTzjrU1flO76hKvP5RA==",
      "cpu": [
        "s390x"
      ],
@@ -379,13 +372,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-s390x": "1.0.0"
+        "@img/sharp-libvips-linux-s390x": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linux-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.1.tgz",
-      "integrity": "sha512-4y8osC0cAc1TRpy02yn5omBeloZZwS62fPZ0WUAYQiLhSFSpWJfY/gMrzKzLcHB9ulUV6ExFiu2elMaixKDbeg==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.2.tgz",
+      "integrity": "sha512-xUT82H5IbXewKkeF5aiooajoO1tQV4PnKfS/OZtb5DDdxS/FCI/uXTVZ35GQ97RZXsycojz/AJ0asoz6p2/H/A==",
      "cpu": [
        "x64"
      ],
@@ -404,13 +397,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linux-x64": "1.0.0"
+        "@img/sharp-libvips-linux-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linuxmusl-arm64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.1.tgz",
-      "integrity": "sha512-D3lV6clkqIKUizNS8K6pkuCKNGmWoKlBGh5p0sLO2jQERzbakhu4bVX1Gz+RS4vTZBprKlWaf+/Rdp3ni2jLfA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.2.tgz",
+      "integrity": "sha512-F+0z8JCu/UnMzg8IYW1TMeiViIWBVg7IWP6nE0p5S5EPQxlLd76c8jYemG21X99UzFwgkRo5yz2DS+zbrnxZeA==",
      "cpu": [
        "arm64"
      ],
@@ -429,13 +422,13 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.0"
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-linuxmusl-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.1.tgz",
-      "integrity": "sha512-LOGKNu5w8uu1evVqUAUKTix2sQu1XDRIYbsi5Q0c/SrXhvJ4QyOx+GaajxmOg5PZSsSnCYPSmhjHHsRBx06/wQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.2.tgz",
+      "integrity": "sha512-+ZLE3SQmSL+Fn1gmSaM8uFusW5Y3J9VOf+wMGNnTtJUMUxFhv+P4UPaYEYT8tqnyYVaOVGgMN/zsOxn9pSsO2A==",
      "cpu": [
        "x64"
      ],
@@ -454,19 +447,19 @@
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.0"
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1"
      }
    },
    "node_modules/@img/sharp-wasm32": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.1.tgz",
-      "integrity": "sha512-vWI/sA+0p+92DLkpAMb5T6I8dg4z2vzCUnp8yvxHlwBpzN8CIcO3xlSXrLltSvK6iMsVMNswAv+ub77rsf25lA==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.2.tgz",
+      "integrity": "sha512-fLbTaESVKuQcpm8ffgBD7jLb/CQLcATju/jxtTXR1XCLwbOQt+OL5zPHSDMmp2JZIeq82e18yE0Vv7zh6+6BfQ==",
      "cpu": [
        "wasm32"
      ],
      "optional": true,
      "dependencies": {
-        "@emnapi/runtime": "^0.44.0"
+        "@emnapi/runtime": "^0.45.0"
      },
      "engines": {
        "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
@@ -479,9 +472,9 @@
      }
    },
    "node_modules/@img/sharp-win32-ia32": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.1.tgz",
-      "integrity": "sha512-/xhYkylsKL05R+NXGJc9xr2Tuw6WIVl2lubFJaFYfW4/MQ4J+dgjIo/T4qjNRizrqs/szF/lC9a5+updmY9jaQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.2.tgz",
+      "integrity": "sha512-okBpql96hIGuZ4lN3+nsAjGeggxKm7hIRu9zyec0lnfB8E7Z6p95BuRZzDDXZOl2e8UmR4RhYt631i7mfmKU8g==",
      "cpu": [
        "ia32"
      ],
@@ -500,9 +493,9 @@
      }
    },
    "node_modules/@img/sharp-win32-x64": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.1.tgz",
-      "integrity": "sha512-XaM69X0n6kTEsp9tVYYLhXdg7Qj32vYJlAKRutxUsm1UlgQNx6BOhHwZPwukCGXBU2+tH87ip2eV1I/E8MQnZg==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.2.tgz",
+      "integrity": "sha512-E4magOks77DK47FwHUIGH0RYWSgRBfGdK56kIHSVeB9uIS4pPFr4N2kIVsXdQQo4LzOsENKV5KAhRlRL7eMAdg==",
      "cpu": [
        "x64"
      ],
@@ -714,15 +707,6 @@
        "@types/node": "*"
      }
    },
-    "node_modules/@types/debug": {
-      "version": "4.1.12",
-      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
-      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
-      "dev": true,
-      "dependencies": {
-        "@types/ms": "*"
-      }
-    },
    "node_modules/@types/express": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
@@ -786,12 +770,6 @@
      "integrity": "sha512-iJt33IQnVRkqeqC7PzBHPTC6fDlRNRW8vjrgqtScAhrmMwe8c4Eo7+fUGTa+XdWrpEgpyKWMYmi2dIwMAYRzPw==",
      "dev": true
    },
-    "node_modules/@types/ms": {
-      "version": "0.7.31",
-      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz",
-      "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==",
-      "dev": true
-    },
    "node_modules/@types/node": {
      "version": "20.2.5",
      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.2.5.tgz",
@@ -804,18 +782,9 @@
      "dev": true
    },
    "node_modules/@types/node-forge": {
-      "version": "1.3.10",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz",
-      "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/pem": {
-      "version": "1.14.4",
-      "resolved": "https://registry.npmjs.org/@types/pem/-/pem-1.14.4.tgz",
-      "integrity": "sha512-Xt6qY6kX1RD4UmYNhWCCf3OSJrRcwbQIaJ/mQSjjAHxIjXMHx/vHNPOgEU3HdVKS1k/U5CZ6ClQlRo8egkl8xg==",
+      "version": "1.3.11",
+      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
+      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
      "dev": true,
      "dependencies": {
        "@types/node": "*"
@@ -1019,11 +988,6 @@
        "node": ">=10"
      }
    },
-    "node_modules/arg": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
-    },
    "node_modules/array-flatten": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -1813,12 +1777,6 @@
        "node": ">= 0.8"
      }
    },
-    "node_modules/fast-diff": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
-      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
-      "peer": true
-    },
    "node_modules/ffmpeg-static": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/ffmpeg-static/-/ffmpeg-static-5.2.0.tgz",
@@ -1865,9 +1823,9 @@
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
    },
    "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
      "funding": [
        {
          "type": "individual",
@@ -2146,14 +2104,6 @@
        "node": ">= 6"
      }
    },
-    "node_modules/hyperdyperid": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
-      "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
-      "engines": {
-        "node": ">=10.18"
-      }
-    },
    "node_modules/iconv-lite": {
      "version": "0.4.24",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -2304,35 +2254,6 @@
        "@pkgjs/parseargs": "^0.11.0"
      }
    },
-    "node_modules/json-joy": {
-      "version": "9.4.0",
-      "resolved": "https://registry.npmjs.org/json-joy/-/json-joy-9.4.0.tgz",
-      "integrity": "sha512-qSWB6VlyQGOdzhjP5eKABYTqAzNlzFaR+uYPYzYijfbhcOSuqWP9Q6bfU7AVvNMFPnaU79vqFqezHeqFtCPXDA==",
-      "dependencies": {
-        "arg": "^5.0.2",
-        "hyperdyperid": "^1.2.0"
-      },
-      "bin": {
-        "json-pack": "bin/json-pack.js",
-        "json-pack-test": "bin/json-pack-test.js",
-        "json-patch": "bin/json-patch.js",
-        "json-patch-test": "bin/json-patch-test.js",
-        "json-pointer": "bin/json-pointer.js",
-        "json-pointer-test": "bin/json-pointer-test.js",
-        "json-unpack": "bin/json-unpack.js"
-      },
-      "engines": {
-        "node": ">=10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "quill-delta": "^5",
-        "rxjs": "7",
-        "tslib": "2"
-      }
-    },
    "node_modules/level": {
      "version": "8.0.0",
      "resolved": "https://registry.npmjs.org/level/-/level-8.0.0.tgz",
@@ -2369,28 +2290,11 @@
        "node": ">=12"
      }
    },
-    "node_modules/linkfs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/linkfs/-/linkfs-2.1.0.tgz",
-      "integrity": "sha512-kmsGcmpvjStZ0ATjuHycBujtNnXiZR28BTivEu0gAMDTT7GEyodcK6zSRtu6xsrdorrPZEIN380x7BD7xEYkew=="
-    },
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==",
-      "peer": true
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
-      "peer": true
-    },
    "node_modules/lru-cache": {
      "version": "10.0.3",
      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz",
@@ -2458,25 +2362,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/memfs": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.6.0.tgz",
-      "integrity": "sha512-I6mhA1//KEZfKRQT9LujyW6lRbX7RkC24xKododIDO3AGShcaFAMKElv1yFGWX8fD4UaSiwasr3NeQ5TdtHY1A==",
-      "dependencies": {
-        "json-joy": "^9.2.0",
-        "thingies": "^1.11.1"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "tslib": "2"
-      }
-    },
    "node_modules/merge-descriptors": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -2490,17 +2375,6 @@
        "node": ">= 0.6"
      }
    },
-    "node_modules/mime": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
-      "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
    "node_modules/mime-db": {
      "version": "1.52.0",
      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -3306,20 +3180,6 @@
        }
      ]
    },
-    "node_modules/quill-delta": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-5.1.0.tgz",
-      "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==",
-      "peer": true,
-      "dependencies": {
-        "fast-diff": "^1.3.0",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isequal": "^4.5.0"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      }
-    },
    "node_modules/range-parser": {
      "version": "1.2.1",
      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -3449,15 +3309,6 @@
        "queue-microtask": "^1.2.2"
      }
    },
-    "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -3584,9 +3435,9 @@
      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
    },
    "node_modules/sharp": {
-      "version": "0.33.1",
-      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.1.tgz",
-      "integrity": "sha512-iAYUnOdTqqZDb3QjMneBKINTllCJDZ3em6WaWy7NPECM4aHncvqHRm0v0bN9nqJxMiwamv5KIdauJ6lUzKDpTQ==",
+      "version": "0.33.2",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.2.tgz",
+      "integrity": "sha512-WlYOPyyPDiiM07j/UO+E720ju6gtNtHjEGg5vovUk1Lgxyjm2LFO+37Nt/UI3MMh2l6hxTWQWi7qk3cXJTutcQ==",
      "hasInstallScript": true,
      "dependencies": {
        "color": "^4.2.3",
@@ -3594,32 +3445,32 @@
        "semver": "^7.5.4"
      },
      "engines": {
-        "libvips": ">=8.15.0",
+        "libvips": ">=8.15.1",
        "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
      },
      "funding": {
        "url": "https://opencollective.com/libvips"
      },
      "optionalDependencies": {
-        "@img/sharp-darwin-arm64": "0.33.1",
-        "@img/sharp-darwin-x64": "0.33.1",
-        "@img/sharp-libvips-darwin-arm64": "1.0.0",
-        "@img/sharp-libvips-darwin-x64": "1.0.0",
-        "@img/sharp-libvips-linux-arm": "1.0.0",
-        "@img/sharp-libvips-linux-arm64": "1.0.0",
-        "@img/sharp-libvips-linux-s390x": "1.0.0",
-        "@img/sharp-libvips-linux-x64": "1.0.0",
-        "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
-        "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
-        "@img/sharp-linux-arm": "0.33.1",
-        "@img/sharp-linux-arm64": "0.33.1",
-        "@img/sharp-linux-s390x": "0.33.1",
-        "@img/sharp-linux-x64": "0.33.1",
-        "@img/sharp-linuxmusl-arm64": "0.33.1",
-        "@img/sharp-linuxmusl-x64": "0.33.1",
-        "@img/sharp-wasm32": "0.33.1",
-        "@img/sharp-win32-ia32": "0.33.1",
-        "@img/sharp-win32-x64": "0.33.1"
+        "@img/sharp-darwin-arm64": "0.33.2",
+        "@img/sharp-darwin-x64": "0.33.2",
+        "@img/sharp-libvips-darwin-arm64": "1.0.1",
+        "@img/sharp-libvips-darwin-x64": "1.0.1",
+        "@img/sharp-libvips-linux-arm": "1.0.1",
+        "@img/sharp-libvips-linux-arm64": "1.0.1",
+        "@img/sharp-libvips-linux-s390x": "1.0.1",
+        "@img/sharp-libvips-linux-x64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-arm64": "1.0.1",
+        "@img/sharp-libvips-linuxmusl-x64": "1.0.1",
+        "@img/sharp-linux-arm": "0.33.2",
+        "@img/sharp-linux-arm64": "0.33.2",
+        "@img/sharp-linux-s390x": "0.33.2",
+        "@img/sharp-linux-x64": "0.33.2",
+        "@img/sharp-linuxmusl-arm64": "0.33.2",
+        "@img/sharp-linuxmusl-x64": "0.33.2",
+        "@img/sharp-wasm32": "0.33.2",
+        "@img/sharp-win32-ia32": "0.33.2",
+        "@img/sharp-win32-x64": "0.33.2"
      }
    },
    "node_modules/shebang-command": {
@@ -3918,17 +3769,6 @@
        "node": ">=8"
      }
    },
-    "node_modules/thingies": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.12.0.tgz",
-      "integrity": "sha512-AiGqfYC1jLmJagbzQGuoZRM48JPsr9yB734a7K6wzr34NMhjUPrWSQrkF7ZBybf3yCerCL2Gcr02kMv4NmaZfA==",
-      "engines": {
-        "node": ">=10.18"
-      },
-      "peerDependencies": {
-        "tslib": "^2"
-      }
-    },
    "node_modules/toidentifier": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
--- a/server/package.json
+++ b/server/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@scrypted/server",
-  "version": "0.82.0",
+  "version": "0.87.0",
  "description": "",
  "dependencies": {
    "@mapbox/node-pre-gyp": "^1.0.11",
@@ -8,25 +8,21 @@
    "adm-zip": "^0.5.10",
    "body-parser": "^1.20.2",
    "cookie-parser": "^1.4.6",
-    "debug": "^4.3.4",
    "engine.io": "^6.5.4",
    "express": "^4.18.2",
    "ffmpeg-static": "^5.2.0",
-    "follow-redirects": "^1.15.4",
+    "follow-redirects": "^1.15.5",
    "http-auth": "^4.2.0",
    "ip": "^1.1.8",
    "level": "^8.0.0",
-    "linkfs": "^2.1.0",
    "lodash": "^4.17.21",
-    "memfs": "^4.6.0",
-    "mime": "^3.0.0",
    "nan": "^2.18.0",
    "node-dijkstra": "^2.5.0",
    "node-forge": "^1.3.1",
    "node-gyp": "^10.0.1",
    "router": "^1.3.8",
    "semver": "^7.5.4",
-    "sharp": "^0.33.1",
+    "sharp": "^0.33.2",
    "source-map-support": "^0.5.21",
    "tar": "^6.2.0",
    "tslib": "^2.6.2",
@@ -37,16 +33,13 @@
  "devDependencies": {
    "@types/adm-zip": "^0.5.5",
    "@types/cookie-parser": "^1.4.6",
-    "@types/debug": "^4.1.12",
    "@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/node-dijkstra": "^2.5.6",
-    "@types/node-forge": "^1.3.10",
-    "@types/pem": "^1.14.4",
+    "@types/node-forge": "^1.3.11",
    "@types/semver": "^7.5.6",
    "@types/source-map-support": "^0.5.10",
    "@types/tar": "^6.1.10",
--- a/server/src/fetch/index.ts
+++ b/server/src/fetch/index.ts
@@ -12,11 +12,11 @@ export interface HttpFetchOptionsBase<B> {
    withCredentials?: boolean;
 }

-export interface HttpFetchJsonOptions<B> extends HttpFetchOptionsBase< B> {
+export interface HttpFetchJsonOptions<B> extends HttpFetchOptionsBase<B> {
    responseType: 'json';
 }

-export interface HttpFetchBufferOptions<B> extends HttpFetchOptionsBase< B> {
+export interface HttpFetchBufferOptions<B> extends HttpFetchOptionsBase<B> {
    responseType: 'buffer';
 }

@@ -126,6 +126,7 @@ export async function domFetch<T extends HttpFetchOptions<BodyInit>>(options: T)
    const { url } = options;
    const response = await fetch(url, {
        method: getFetchMethod(options),
+        credentials: options.withCredentials ? 'include' : undefined,
        headers,
        signal: options.timeout ? AbortSignal.timeout(options.timeout) : undefined,
        body,
--- a/server/src/http-interfaces.ts
+++ b/server/src/http-interfaces.ts
@@ -5,7 +5,6 @@ import net from 'net';
 import { join as pathJoin } from 'path';
 import { RpcPeer } from "./rpc";

-const mime = require('mime/lite');
 export class HttpResponseImpl implements HttpResponse {
    constructor(public res: Response, public unzippedDir: string, public filesPath: string) {
    }
@@ -49,13 +48,6 @@ export class HttpResponseImpl implements HttpResponse {
            this.res.status(options.code);
        this.#setHeaders(options);

-        if (!this.res.getHeader('Content-Type')) {
-            const type = mime.getType(path);
-            if (type) {
-                this.res.contentType(mime.getExtension(type));
-            }
-        }
-
        let filePath = pathJoin(this.unzippedDir, 'fs', path);
        if (!fs.existsSync(filePath)) {
            filePath = pathJoin(this.filesPath, path);
--- a/server/src/plugin/media.ts
+++ b/server/src/plugin/media.ts
@@ -2,13 +2,13 @@ import { BufferConverter, DeviceManager, FFmpegInput, MediaManager, MediaObject
 import pathToFfmpeg from 'ffmpeg-static';
 import fs from 'fs';
 import https from 'https';
-import mimeType from 'mime';
 import Graph from 'node-dijkstra';
 import os from 'os';
 import path from 'path';
 import MimeType from 'whatwg-mimetype';
 import { MediaObject } from "./mediaobject";
 import { MediaObjectRemote } from "./plugin-api";
+import send from 'send';

 function typeMatches(target: string, candidate: string): boolean {
    // candidate will accept anything
@@ -78,7 +78,7 @@ export abstract class MediaManagerBase implements MediaManager {
                }

                const ab = await fs.promises.readFile(filename);
-                const mt = mimeType.getType(data.toString());
+                const mt = send.mime.lookup(filename);
                const mo = this.createMediaObject(ab, mt);
                return mo;
            }
@@ -231,7 +231,7 @@ export abstract class MediaManagerBase implements MediaManager {

    ensureMediaObjectRemote(mediaObject: string | MediaObjectInterface): MediaObjectRemote {
        if (typeof mediaObject === 'string') {
-            const mime = mimeType.getType(mediaObject);
+            const mime = send.mime.lookup(mediaObject);
            return this.createMediaObjectRemote(mediaObject, mime);
        }
        return mediaObject as MediaObjectRemote;
--- a/server/src/plugin/plugin-host.ts
+++ b/server/src/plugin/plugin-host.ts
@@ -84,9 +84,11 @@ export class PluginHost {
    }

    async upsertDevice(upsert: Device) {
+        const newDevice = !this.scrypted.findPluginDevice(this.pluginId, upsert.nativeId);
        const { pluginDevicePromise, interfacesChanged } = this.scrypted.upsertDevice(this.pluginId, upsert);
        const pi = await pluginDevicePromise;
-        await this.remote.setNativeId(pi.nativeId, pi._id, pi.storage || {});
+        if (newDevice)
+            await this.remote.setNativeId(pi.nativeId, pi._id, pi.storage || {});
        // fetch a new device instance if the descriptor changed.
        // plugin may return the same instance.
        // this avoids device and mixin churn.
--- a/server/src/plugin/plugin-remote-worker.ts
+++ b/server/src/plugin/plugin-remote-worker.ts
@@ -2,7 +2,6 @@ import { ScryptedStatic, SystemManager } from '@scrypted/types';
 import AdmZip from 'adm-zip';
 import { once } from 'events';
 import fs from 'fs';
-import { Volume } from 'memfs';
 import net from 'net';
 import path from 'path';
 import { install as installSourceMapSupport } from 'source-map-support';
@@ -19,7 +18,7 @@ import { DeviceManagerImpl, PluginReader, attachPluginRemote, setupPluginRemote
 import { PluginStats, startStatsUpdater } from './plugin-remote-stats';
 import { createREPLServer } from './plugin-repl';
 import { NodeThreadWorker } from './runtime/node-thread-worker';
-const { link } = require('linkfs');
+import worker_threads from 'worker_threads';

 const serverVersion = require('../../package.json').version;

@@ -196,10 +195,18 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                }
            }

-            let volume: any;
+            // let volume: any;
            let pluginReader: PluginReader;
            if (zipOptions?.unzippedPath && fs.existsSync(zipOptions?.unzippedPath)) {
-                volume = link(fs, ['', path.join(zipOptions.unzippedPath, 'fs')]);
+                if (worker_threads.isMainThread) {
+                    const fsDir = path.join(zipOptions.unzippedPath, 'fs')
+                    if (fs.existsSync(fsDir))
+                        process.chdir(fsDir);
+                    else
+                        process.chdir(zipOptions.unzippedPath);
+                }
+
+                // volume = link(fs, ['', path.join(zipOptions.unzippedPath, 'fs')]);
                pluginReader = name => {
                    const filename = path.join(zipOptions.unzippedPath, name);
                    if (!fs.existsSync(filename))
@@ -208,18 +215,20 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
                };
            }
            else {
+                // this code path was used in testing and should be unreachable.
+
                const admZip = new AdmZip(zipData);
-                volume = new Volume();
-                for (const entry of admZip.getEntries()) {
-                    if (entry.isDirectory)
-                        continue;
-                    if (!entry.entryName.startsWith('fs/'))
-                        continue;
-                    const name = entry.entryName.substring('fs/'.length);
-                    volume.mkdirpSync(path.dirname(name));
-                    const data = entry.getData();
-                    volume.writeFileSync(name, data);
-                }
+                // volume = new Volume();
+                // for (const entry of admZip.getEntries()) {
+                //     if (entry.isDirectory)
+                //         continue;
+                //     if (!entry.entryName.startsWith('fs/'))
+                //         continue;
+                //     const name = entry.entryName.substring('fs/'.length);
+                //     volume.mkdirpSync(path.dirname(name));
+                //     const data = entry.getData();
+                //     volume.writeFileSync(name, data);
+                // }

                pluginReader = name => {
                    const entry = admZip.getEntry(name);
@@ -235,9 +244,6 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
            const pnp = getPluginNodePath(pluginId);
            pluginConsole?.log('node modules', pnp);
            params.require = (name: string) => {
-                if (name === 'fakefs' || (name === 'fs' && !packageJson.scrypted.realfs)) {
-                    return volume;
-                }
                if (name === 'realfs') {
                    return require('fs');
                }
--- a/server/src/runtime.ts
+++ b/server/src/runtime.ts
@@ -52,7 +52,7 @@ interface DeviceProxyPair {
    proxy: ScryptedDevice;
 }

-const MIN_SCRYPTED_CORE_VERSION = 'v0.1.147';
+const MIN_SCRYPTED_CORE_VERSION = 'v0.2.6';
 const PLUGIN_DEVICE_STATE_VERSION = 2;

 interface HttpPluginData {
@@ -65,7 +65,6 @@ export type RuntimeHost = (mainFilename: string, pluginId: string, options: Runt
 export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
    clusterId = crypto.randomBytes(3).toString('hex');
    clusterSecret = crypto.randomBytes(16).toString('hex');
-    datastore: Level;
    plugins: { [id: string]: PluginHost } = {};
    pluginDevices: { [id: string]: PluginDevice } = {};
    devices: { [id: string]: DeviceProxyPair } = {};
@@ -105,10 +104,8 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
    info = new Info();
    pluginHosts = new Map<string, RuntimeHost>();

-    constructor(public mainFilename: string, datastore: Level, insecure: http.Server, secure: https.Server, app: express.Application) {
+    constructor(public mainFilename: string, public datastore: Level, insecure: http.Server, secure: https.Server, app: express.Application) {
        super(app);
-        this.datastore = datastore;
-        this.app = app;
        // ensure that all the users are loaded from the db.
        this.usersService.getAllUsers();

--- a/server/src/scrypted-server-main.ts
+++ b/server/src/scrypted-server-main.ts
@@ -26,11 +26,12 @@ import { getNpmPackageInfo } from './services/plugin';
 import { setScryptedUserPassword, UsersService } from './services/users';
 import { sleep } from './sleep';
 import { ONE_DAY_MILLISECONDS, UserToken } from './usertoken';
+import AdmZip from 'adm-zip';

 export type Runtime = ScryptedRuntime;

-if (!semver.gte(process.version, '16.0.0')) {
-    throw new Error('"node" version out of date. Please update node to v16 or higher.')
+if (!semver.gte(process.version, '18.0.0')) {
+    throw new Error('"node" version out of date. Please update node to v18 or higher.')
 }

 process.on('unhandledRejection', error => {
@@ -112,6 +113,7 @@ app.use(bodyParser.raw({ type: 'application/zip', limit: 100000000 }) as any)

 async function start(mainFilename: string, options?: {
    onRuntimeCreated?: (runtime: ScryptedRuntime) => Promise<void>,
+    restart?: () => void,
 }) {
    const volumeDir = getScryptedVolume();
    await fs.promises.mkdir(volumeDir, {
@@ -335,6 +337,90 @@ async function start(mainFilename: string, options?: {
    await options?.onRuntimeCreated?.(scrypted);
    await scrypted.start();

+
+    app.post('/web/component/restore', async (req, res) => {
+        const buffers: Buffer[] = [];
+        let zip: AdmZip;
+        req.on('data', b => buffers.push(b));
+        try {
+            await once(req, 'end');
+            zip = new AdmZip(Buffer.concat(buffers));
+            if (!zip.test())
+                throw new Error('backup zip test failed.');
+        }
+        catch (e) {
+            res.send({
+                error: "Error during restore.",
+            });
+            return;
+        }
+        try {
+            scrypted.kill();
+            await sleep(5000);
+            await db.close();
+
+            await fs.promises.rm(volumeDir, {
+                recursive: true,
+                force: true,
+            });
+
+            await fs.promises.mkdir(volumeDir, {
+                recursive: true
+            });
+
+            zip.extractAllTo(dbPath, true);
+
+            res.send({
+                success: true,
+            });
+        }
+        catch (e) {
+            res.send({
+                error: "Error during restore.",
+            });
+        }
+
+        if (options?.restart)
+            options.restart();
+        else
+            process.exit();
+    });
+
+    app.get('/web/component/backup', async (req, res) => {
+        try {
+            const backupDbPath = path.join(volumeDir, 'backup.db');
+            await fs.promises.rm(backupDbPath, {
+                recursive: true,
+                force: true,
+            });
+
+            const backupDb = new Level(backupDbPath);
+            await backupDb.open();
+            for await (const [key, value] of db.iterator()) {
+                await backupDb.put(key, value);
+            }
+            await backupDb.close();
+
+            const backupZip = path.join(volumeDir, 'backup.zip');
+            await fs.promises.rm(backupZip, {
+                recursive: true,
+                force: true,
+            });
+
+            const zip = new AdmZip();
+            await zip.addLocalFolderPromise(backupDbPath, {});
+            const zipBuffer = await zip.toBufferPromise();
+            // the file is a normal zip file, but an extension is added to prevent safari, etc, from unzipping it automatically.
+            res.header('Content-Disposition', 'attachment; filename="scrypted.zip.backup"')
+            res.send(zipBuffer);
+        }
+        catch (e) {
+            console.error('Backup error', e);
+            res.status(500);
+            res.send('Internal Error');
+        }
+    });
+
    app.get(['/web/component/script/npm/:pkg', '/web/component/script/npm/@:owner/:pkg'], async (req, res) => {
        const { owner, pkg } = req.params;
        let endpoint = pkg;
Author	SHA1	Message	Date
Koushik Dutta	c8e94c0386	Merge branch 'main' of github.com:koush/scrypted	2024-01-18 13:15:41 -08:00
Koushik Dutta	8c6e7b997a	ui: implement backup/restore	2024-01-18 13:15:37 -08:00
Johannes Bosecker	9abc7ca139	amcrest: Implemented other intercom codec for Dahua doorbells (G.711A). (#1273 )	2024-01-18 12:36:11 -08:00
Koushik Dutta	2a943eb5e0	postbeta	2024-01-18 09:33:13 -08:00
Koushik Dutta	a4fe78a48b	ha: publish	2024-01-17 22:07:56 -08:00
Koushik Dutta	50ff0833c9	server: new node min verison	2024-01-17 10:26:30 -08:00
Koushik Dutta	c94085a6c7	zwave: smoke alarm support	2024-01-17 10:25:48 -08:00
Koushik Dutta	c477437456	server: add hook for restart	2024-01-14 15:47:25 -08:00
Koushik Dutta	0da96130fe	Merge branch 'main' of github.com:koush/scrypted	2024-01-14 15:36:17 -08:00
Koushik Dutta	fdbf7ab60b	server: implement backup/restore	2024-01-14 15:36:08 -08:00
Long Zheng	0cecfb86ff	npm-install.sh install auth-fetch package (#1267 )	2024-01-14 14:46:23 -08:00
Koushik Dutta	9a195c6207	homekit: fix prune crash	2024-01-14 14:25:30 -08:00
Koushik Dutta	47021a7743	server: reduce deps	2024-01-14 14:25:19 -08:00
Koushik Dutta	01400cf206	core: prep for server fakefs removal	2024-01-14 14:24:43 -08:00
Koushik Dutta	99da29a738	postrelease	2024-01-14 08:06:50 -08:00
Koushik Dutta	6378c5953a	server: bump core	2024-01-14 08:06:42 -08:00
Koushik Dutta	846034d7c8	core: fix login	2024-01-14 08:06:25 -08:00
Koushik Dutta	ad47f14922	ha: publish	2024-01-13 22:45:05 -08:00
Koushik Dutta	0066379b1e	postrelease	2024-01-13 22:18:49 -08:00
Koushik Dutta	54193251ab	server: bump minimum core version	2024-01-13 22:17:40 -08:00
Koushik Dutta	cd5e169439	core: publish	2024-01-13 22:16:18 -08:00
Koushik Dutta	249a87bd4c	cameras: fix validation skip, update auth lib	2024-01-13 19:29:35 -08:00
Koushik Dutta	803400c2d8	homekit: bump deps and publish	2024-01-13 18:34:04 -08:00
Koushik Dutta	0e700a53d0	snapshot: give periodic snapshots a moment to return	2024-01-13 17:05:26 -08:00
Koushik Dutta	72647b0099	Update Dockerfile.lite	2024-01-13 16:17:38 -08:00
Koushik Dutta	85e41180b2	Update docker-common.yml	2024-01-13 16:14:38 -08:00
Koushik Dutta	18bf012bb5	docker: udpate base	2024-01-13 16:12:43 -08:00
Koushik Dutta	3f2b8de169	Merge branch 'main' of github.com:koush/scrypted	2024-01-13 16:01:37 -08:00
Koushik Dutta	c568c9a37d	shrink lite build further	2024-01-13 16:01:12 -08:00
Koushik Dutta	a831c48f5f	server: fix stupid esm mime dependency	2024-01-12 18:22:41 -08:00
Koushik Dutta	f0357d45f2	server: fix stupid esm mime dependency	2024-01-12 18:14:31 -08:00
Koushik Dutta	479b3ce1f3	postrelease	2024-01-12 16:39:30 -08:00
Koushik Dutta	bd7c7de8a5	Update package.json	2024-01-12 16:37:55 -08:00
Koushik Dutta	a06e786d19	client: Fix cors credentials	2024-01-12 15:51:06 -08:00
Koushik Dutta	dff05e733e	server: update lockfile	2024-01-12 15:39:29 -08:00
Koushik Dutta	76e34af149	postrelease	2024-01-12 15:13:29 -08:00